14596 Commits

Author SHA1 Message Date
Wayne Witzel III
e9be93cd70 Update tower_tools image to run nginx 2016-10-18 11:16:38 -04:00
Aaron Tan
5fdd44c3f4 Fix mutable default argument issue. 2016-10-18 09:48:19 -04:00
sundeep-co-in
78a8ce9479 django i18n 2016-10-18 18:10:39 +05:30
Alan Rominger
4ba8b87065 Merge pull request #3728 from AlanCoding/workflow_labels
Workflow Labels
2016-10-18 08:40:09 -04:00
Chris Church
5e8a7eeb8a Return empty dict if no license present (or invalid key). 2016-10-18 00:22:15 -04:00
Chris Church
e02d945e1d Merge pull request #3703 from cchurch/allow-file-scm-urls
Enable support for file scheme in SCM URLs.
2016-10-17 23:51:10 -04:00
AlanCoding
41d7bd84a8 implement labels for workflows JT and workflow jobs 2016-10-17 17:38:42 -04:00
Aaron Tan
c595492950 Solve rebase conflicts. 2016-10-17 17:08:05 -04:00
Aaron Tan
21feae7c11 Rename default timeout and remove runtime_flag. 2016-10-17 16:56:39 -04:00
Aaron Tan
2362f34d27 Implement pluggable job explanation. 2016-10-17 16:56:39 -04:00
Aaron Tan
701c23171f Remove timeout fields from sys job & adhoc cmd. 2016-10-17 16:56:39 -04:00
Aaron Tan
96e3228c9d Change global settings structure and fix potential celery issue. 2016-10-17 16:56:39 -04:00
Aaron Tan
651a09f5fb Remove stdout indicator. 2016-10-17 16:56:39 -04:00
Aaron Tan
33952808c4 Readability improvement and job explaination added. 2016-10-17 16:56:39 -04:00
Aaron Tan
70481414c6 Migration update. 2016-10-17 16:56:39 -04:00
Aaron Tan
69be94feb9 Implement global job timeout mechanism. 2016-10-17 16:56:39 -04:00
Aaron Tan
2eda6b9528 Implement timeout on other unified jobs/JTs. 2016-10-17 16:56:39 -04:00
Aaron Tan
d52e237ea0 Implement timeout on job/job-template. 2016-10-17 16:56:39 -04:00
Aaron Tan
37139301b4 Add job timeout mechanism to tasks. 2016-10-17 16:53:54 -04:00
Wayne Witzel III
f5f4785714 Merge pull request #3668 from wwitzel3/channels-deployment
Channels deployment
2016-10-17 15:46:42 -04:00
Aaron Tan
f4c93f842d Merge pull request #3715 from jangsutsr/3380_add_corner_case_check_to_user_can_admin
Add corner case check to user can_admin.
2016-10-17 15:32:11 -04:00
Bill Nottingham
83892b0d5f Merge pull request #3726 from wenottingham/support-fu
Remove support@ansible.com, clean up some old links.
2016-10-17 15:21:41 -04:00
Bill Nottingham
d89c07a25b Remove support@ansible.com, clean up some old links.
Cherry-picked from devel.
2016-10-17 15:18:46 -04:00
Bill Nottingham
2ed50e05c1 Merge pull request #3714 from wenottingham/devel
Remove support@ansible.com, clean up some old links.
2016-10-17 15:15:52 -04:00
AlanCoding
f3cbf71457 WFJ node-node relationships should work correctly now 2016-10-17 15:08:06 -04:00
Wayne Witzel III
d027c98a8f Merge pull request #3720 from wwitzel3/dev-nginx
change static path to match what ui-release produces
2016-10-17 10:07:36 -04:00
Wayne Witzel III
3a323e1b39 change static path to match what ui-release produces 2016-10-17 09:58:15 -04:00
AlanCoding
5e4a4b9722 refactor Job can_read to allow for org admins and auditors to read 2016-10-14 15:52:41 -04:00
AlanCoding
9a44dc4ba0 add can_read method to JobAccess 2016-10-14 15:06:54 -04:00
Aaron Tan
d9ac461bb8 Merge pull request #3696 from jangsutsr/3535_add_rbac_check_to_project_validate
Patch up missing org access checks in access.py
2016-10-14 14:37:52 -04:00
Chris Church
f988e3791c Merge pull request #3648 from cchurch/no-filter-on-password-fields
Prevent filtering on password fields.
2016-10-14 14:19:43 -04:00
Wayne Witzel III
0c7014eacb nginx config fixes 2016-10-14 13:38:09 -04:00
Wayne Witzel III
1d677dad91 Merge branch 'devel' into channels-deployment 2016-10-14 13:33:51 -04:00
Wayne Witzel III
7ea84d92ef Merge pull request #3716 from wwitzel3/dev-nginx
Use uwsgi/daphne/nginx for dev
2016-10-14 13:27:44 -04:00
Wayne Witzel III
0666e40be8 fix make server to run other services 2016-10-14 12:04:30 -04:00
Aaron Tan
3999ffd52a Unit test & project access refactoring to prevent potential issue. 2016-10-14 11:36:20 -04:00
Alan Rominger
330d3d3f6c Merge pull request #3717 from AlanCoding/flake8_31
flake8 fixes
2016-10-14 10:08:16 -04:00
AlanCoding
8d89d68d5e flake8 fixes for Jenkins 2016-10-14 09:46:41 -04:00
Wayne Witzel III
90ed95abd1 add https ports 2016-10-14 02:23:12 -04:00
Wayne Witzel III
eb3ec0b083 daphne should listen on 0.0.0.0 2016-10-14 02:00:56 -04:00
Wayne Witzel III
4220246400 use uwsgi/daphne/nginx for dev 2016-10-14 01:45:08 -04:00
Aaron Tan
f301cb0f9b Split unit tests & add access obj org sanity check. 2016-10-13 17:06:37 -04:00
Aaron Tan
189bdd6167 Add corner case check to user can_admin. 2016-10-13 16:48:39 -04:00
Bill Nottingham
afb1fe8d69 Remove support@ansible.com, clean up some old links. 2016-10-13 16:41:34 -04:00
Alan Rominger
1979d63c25 Merge pull request #3708 from AlanCoding/ancestors_PR
Store vars from set_artifact tasks, pipe data through workflows
2016-10-13 15:59:58 -04:00
Aaron Tan
a0ea2337c6 Unit tests added. 2016-10-13 15:35:03 -04:00
Alan Rominger
7022edc646 Merge pull request #3701 from AlanCoding/wf_socket
Get workflows and channels to work together
2016-10-13 15:32:43 -04:00
Aaron Tan
1d3c890e79 null value check added. 2016-10-13 14:59:57 -04:00
jlmitch5
237e91bcb2 Merge pull request #3681 from jlmitch5/fixManProjectSelect
fixed manual project select2 population
2016-10-13 12:40:47 -04:00
Wayne Witzel III
280d265d4e filter internal User.admin_roles from the /roles API list view 2016-10-13 12:29:02 -04:00