1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Commit Graph

9912 Commits

Author SHA1 Message Date
Aaron Tan
4ee7d1a136 Catch the missing piece. 2016-11-15 16:50:23 -05:00
Aaron Tan
473ed016de Fix flake8 E305 errors. 2016-11-15 16:32:27 -05:00
Michael Abashian
831b67ce7f Merge pull request #4014 from mabashian/3968-workflow-graph-on-details-v2
Add workflow graph to details view and re-org job-templates directory
2016-11-15 14:13:30 -05:00
Chris Church
fa29ce6382 Update AWX_ANSIBLE_CALLBACK_PLUGINS help text. 2016-11-15 12:36:29 -05:00
Aaron Tan
44cc57afba Merge pull request #4017 from jangsutsr/3976_rename_type_in_wfjt_delete_conflict_message
Rename type in workflow job template delete conflict message
2016-11-15 12:03:28 -05:00
Alan Rominger
50cafe4456 Merge pull request #3949 from AlanCoding/label_ct_opt
Optimization to avoid query for count of JT /  labels
2016-11-15 11:48:29 -05:00
Aaron Tan
c32185312b Rename type in wfjt delete conflict message. 2016-11-15 11:27:31 -05:00
Chris Church
dac208f384 Merge pull request #4010 from cchurch/job-timeout-defaults
Add default values for job timeouts.
2016-11-15 10:59:44 -05:00
Chris Church
21753ce49c Merge pull request #4008 from cchurch/conf-jsonfield-fixes
Fix configure Tower in Tower to work with updated django-jsonfield.
2016-11-15 10:57:42 -05:00
Chris Church
3eb6f55a80 Default JSONField to empty dict if field does not allow None. 2016-11-15 10:21:34 -05:00
Shane McDonald
c80a750457 Merge pull request #4012 from shanemcd/activate-venv-flake8
Activate venv in flake8 target
2016-11-15 10:11:45 -05:00
Michael Abashian
17b4b1e7a2 Moved a significant amount of the tree generation logic out to the workflow service 2016-11-15 09:58:25 -05:00
Michael Abashian
bcf768e7fc Included the workflow graph directive on the workflow details view. Re-organized the job templates directory. It's now just "templates" 2016-11-15 09:58:25 -05:00
Shane McDonald
4330eb7907 Activate venv in flake8 target 2016-11-15 09:54:42 -05:00
Chris Meyers
e7b9410361 fix up python requirements test 2016-11-15 09:19:29 -05:00
Chris Meyers
1883485724 towards virtualenv being exactly requirements.txt
* Ignore already installed (usually global) packages when installing
requirements.txt into the virtualenv.
2016-11-15 09:19:29 -05:00
Alan Rominger
ca34ea4c3b Merge pull request #4011 from AlanCoding/sys_aud_test_issue
Remove in-place operations on Models in unit tests
2016-11-15 09:13:33 -05:00
Chris Meyers
81720a6a2a bump cellery billiard requirement 2016-11-15 08:43:51 -05:00
AlanCoding
262f82af43 flake8 fix 2016-11-15 08:42:22 -05:00
AlanCoding
5258c2a040 Remove in-place operations on model in test_label unit test 2016-11-15 08:33:29 -05:00
AlanCoding
1ca9426270 Remove in-place operation on User in unit test 2016-11-15 08:06:40 -05:00
Chris Church
443f100b5f Add default values for job timeouts. 2016-11-15 01:12:06 -05:00
Chris Church
8dc5e7725c Fix configure Tower in Tower to work with updated django-jsonfield. 2016-11-15 00:22:55 -05:00
Alan Rominger
f5d3e1885e Merge pull request #4003 from AlanCoding/test_fix
Change ordering of test dirs
2016-11-14 18:08:31 -05:00
AlanCoding
8f3e3c4ae1 change ordering of test dirs 2016-11-14 17:50:10 -05:00
Alan Rominger
731420a834 Merge pull request #3992 from AlanCoding/jsonfd_monkey
New method to monkeypatch JSONField
2016-11-14 17:12:47 -05:00
AlanCoding
339661a6a5 New method to monkeypatch JSONField 2016-11-14 16:35:56 -05:00
Chris Meyers
9f40e7ef70 fix notification unit test mock 2016-11-14 16:29:34 -05:00
jaredevantabor
fb7be12110 Removing stale pendo file
a working version of this file exists in a directory above this file already
2016-11-14 12:42:11 -08:00
Chris Meyers
f1f92deb1f bump up django-jsonfield 2016-11-14 14:34:46 -05:00
Chris Meyers
0c2d9e09b9 use known working django-jsonfield 2016-11-14 13:26:24 -05:00
jaredevantabor
1b79503075 making workflow-results panels the height of the viewport 2016-11-14 10:00:22 -08:00
Chris Meyers
ec83a1cb47 use django-jsonfield not jsonfield 2016-11-14 12:18:29 -05:00
Chris Meyers
356b0af3cd bump channels version 2016-11-14 11:11:29 -05:00
Chris Meyers
1d513252e4 fix up requirements 2016-11-14 09:16:26 -05:00
Chris Meyers
545412a6b5 remove inline requirements comment 2016-11-14 08:46:46 -05:00
Chris Meyers
c95ef4dc07 add requirements unit test 2016-11-11 17:19:52 -05:00
Michael Abashian
887afb79f8 Merge pull request #3978 from mabashian/3528-workflow-launch-transition
Transition the user to the workflow details view after launch
2016-11-11 16:16:39 -05:00
Leigh Johnson
649dbef47d Initialize empty global.$ENV in RC builds, resolves #3940 (#3981) 2016-11-11 16:15:23 -05:00
Chris Meyers
3d4f359cbc Revert "Read the branch name"
This reverts commit e38bfbce6adc0e94a72bd3eda908263aa6cc651a.
2016-11-11 16:01:45 -05:00
Chris Meyers
5f10c849fa Read the branch name 2016-11-11 16:00:53 -05:00
Shane McDonald
933ae7d0ab Merge pull request #3975 from ansible/unit-test-base-image
Use tower_devel as base image for unit tests
2016-11-11 16:00:04 -05:00
Michael Abashian
392ee19290 Transition the user to the workflow details view after launch 2016-11-11 15:56:45 -05:00
Chris Meyers
241019568c use jsonfield instead of django-jsonfield 2016-11-11 15:47:41 -05:00
Shane McDonald
30e5904ab3 Use tower_devel as base image for unit tests 2016-11-11 15:47:17 -05:00
Alan Rominger
1885ca0adc Merge pull request #3974 from AlanCoding/notification_test
Avoid using serialized notification configuraiton
2016-11-11 15:32:15 -05:00
AlanCoding
059345e330 avoid reading notification configuration from already-serialized data 2016-11-11 15:23:49 -05:00
Chris Meyers
5b4892250d fix partial test
* We shouldn't care what order the inventory updates for the inventory
sources are returned in.
2016-11-11 15:13:28 -05:00
Chris Meyers
0efe8e9cfb fix license test
so that the license file on dev machines isn't accidentally picked up
2016-11-11 14:43:00 -05:00
Shane McDonald
5657671fb9 Add unit test artifacts to clean target 2016-11-11 14:39:23 -05:00