9933 Commits

Author SHA1 Message Date
Chris Meyers
ef0df1fefd more j -> workflow_job renaming 2016-11-17 10:51:06 -05:00
Chris Meyers
07996abf64 in the api, finish renaming wfjt -> job relation
related to #4052
related to #3976
2016-11-17 10:40:28 -05:00
Chris Meyers
df5e3288c4 Revert "in the api, finish renaming wfjt -> job relation"
This reverts commit 8ee469ceeb0d9e7514f930c6325d1577bf5505c8.
2016-11-17 10:39:17 -05:00
Chris Meyers
d9821dbb6c in the api, finish renaming wfjt -> job relation
related to #4052
related to #3976
2016-11-17 10:29:34 -05:00
Bill Nottingham
84d4078a77 Merge pull request #3969 from wenottingham/no-more-8080
Drop firewall configuration for port 8080.
2016-11-16 21:01:56 -05:00
Chris Meyers
edaf018f2c Revert "factored out base requirements"
This reverts commit c5129a054c272a5e59008b3dc4d8a2f287f310a6.
2016-11-16 13:39:44 -05:00
Chris Meyers
827b4e1537 factored out base requirements
* bumped all dependent packages that are not base
2016-11-16 13:35:35 -05:00
Aaron Tan
344a522f3e Merge pull request #4028 from jangsutsr/3976_update_workflow_job_foreign_key_related_name
Update workflow job foreign key related_name.
2016-11-16 12:44:21 -05:00
Chris Meyers
8a6a061cbb Update task_manager_system.md 2016-11-16 10:51:12 -05:00
Aaron Tan
1cbeb71843 Merge pull request #4034 from jangsutsr/4023_resume_flake8_E302
Resume flake8 E302.
2016-11-16 10:41:18 -05:00
Chris Meyers
dd032c8463 Update task_manager_system.md 2016-11-16 10:37:26 -05:00
Aaron Tan
2d1a5425d1 Fix flake8 E302 errors second round. 2016-11-16 09:56:07 -05:00
Aaron Tan
9e4655419e Fix flake8 E302 errors. 2016-11-15 20:59:39 -05:00
Chris Church
77a0e1445a Merge pull request #4009 from cchurch/fix-callback-url-fields
Fix callback URL fields to update when TOWER_URL_BASE changes
2016-11-15 18:28:44 -05:00
Aaron Tan
7dddae1254 Resume flake8 E302. 2016-11-15 17:31:21 -05:00
Aaron Tan
929528b9cc Merge pull request #4031 from jangsutsr/4023_fix_flake8_E305
Fix flake8 E305 errors.
2016-11-15 17:24:19 -05:00
Aaron Tan
8a55c90c2c Remove unnecessary migrations. 2016-11-15 17:19:09 -05:00
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
Aaron Tan
32fe6ea4fa Test fixture update. 2016-11-15 15:52:55 -05:00
Aaron Tan
3801b4a4e9 Update workflow job foreign key related_name. 2016-11-15 15:17:45 -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
89c629e796 Never return database values for read-only fields. 2016-11-15 00:59:10 -05:00
Chris Church
e22b0f75b8 Fix social auth callback URLs to depend on TOWER_URL_BASE so they are updated when it changes. 2016-11-15 00:58:33 -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