External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity
9,431 Commits 54 Branches 19 Tags
Commit Graph

9431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Aaron Tan
4ae11f6557 Patch up missing org access checks in access.py 2016-10-13 11:45:34 -04:00
AlanCoding
7472fbae8f insert back in REPLACE_STR import that was lost 2016-10-13 11:05:06 -04:00
AlanCoding
638b07e17b remove yaml and json imports from workflow 2016-10-13 10:47:11 -04:00
Shane McDonald
f0d0a3e20d Merge pull request #3705 from ansible/exclude-setup-test 
Exclude test directory from setup bundle tarballs
 2016-10-13 09:30:16 -04:00
AlanCoding
ef861e5256 move set_artifact module to its own repository 2016-10-12 17:54:35 -04:00
AlanCoding
5d4cf9d4fc Add job artifacts and workflow artifact passing 
artifacts redact from job when no_log is set
parent no_log artifacts treated as survey passwords
 2016-10-12 17:45:50 -04:00
Shane McDonald
c80a8a9c14 Exclude test directory from setup bundle tarballs 
Also using the rsync strategy in the tar-build target. This doesn’t leave behind the empty setup/test directory.
 2016-10-12 16:07:25 -04:00
Chris Church
bedb363613 Merge pull request #3665 from cchurch/prevent-removing-license-via-system-settings 
Prevent removing license via settings
 2016-10-12 14:54:49 -04:00
Chris Church
8883738a7c Fix issue when string list settings field is null. Resolves #3683. 2016-10-12 14:47:22 -04:00
AlanCoding
3cfe544ada update workflows to work with new channels implementation 2016-10-12 13:54:13 -04:00
Chris Church
2488e1e3f0 Show actual settings module in use. 2016-10-12 13:40:05 -04:00
Jake McDermott
b827a711c5 Merge pull request #3700 from jakemcdermott/noissue_fix_rabbitmq_setting_migration 
actually invoke template module in install role
 2016-10-11 18:44:56 -04:00
Jake McDermott
d3a36aefc3 Merge pull request #3686 from jakemcdermott/noissue_fix_rabbitmq_setting_migration 
ensure CLUSTER_HOST_ID setting is consumed by settings migration when updating tower
 2016-10-11 18:13:15 -04:00
Jared Tabor
1fe783f63c Merge pull request #3699 from jaredevantabor/secure-socket 
switching websocket to secure websocket (wss://) dpending on protocol
 2016-10-11 14:25:58 -07:00
jaredevantabor
9274b90b9b switching websocket to secure websocket (wss://) dpending on protocol 2016-10-11 14:22:42 -07:00