External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 16:30:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
9,469 Commits 63 Branches 102 Tags
2a504ff0402920e280c19edc08a5e0e382e2ec11
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Rominger 532ee059ea Merge pull request #3746 from AlanCoding/uwsgi_reload 
Hopefully get uwsgi to auto reload
 2016-10-20 09:08:34 -04:00
AlanCoding e7f16620bb Attempt to get uwsgi to auto reload 2016-10-19 10:39:17 -04:00
Alan Rominger 4ba8b87065 Merge pull request #3728 from AlanCoding/workflow_labels 
Workflow Labels
 2016-10-18 08:40:09 -04:00
AlanCoding 41d7bd84a8 implement labels for workflows JT and workflow jobs 2016-10-17 17:38:42 -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
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
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
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
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
AlanCoding 3cfe544ada update workflows to work with new channels implementation 2016-10-12 13:54:13 -04:00
Alan Rominger 7bd19b8e98 Merge pull request #3687 from AlanCoding/wf_fixes 
Workflow serializer fixes
 2016-10-11 08:39:01 -04:00
AlanCoding 21a04f196c workflow serializer fixes 2016-10-10 17:13:02 -04:00
Alan Rominger cd8aeac5c3 Merge pull request #3644 from AlanCoding/3559_manual_proj 
Set `start` capability to False for manual projects
 2016-10-06 12:04:35 -04:00
Alan Rominger c1b87baced Merge pull request #3649 from AlanCoding/WJ_license 
extend license fix to workflow jobs
 2016-10-04 09:41:21 -04:00
AlanCoding e1ace0ba0a extend license fix to workflow jobs 2016-10-03 20:32:11 -04:00
Alan Rominger f23a87e5a0 Merge pull request #3553 from AlanCoding/wf_rbac_prompt 
workflows RBAC and prompting
 2016-10-03 15:34:47 -04:00
AlanCoding 0154c41eb2 switch to UJT method of creating new jobs 2016-10-03 15:22:15 -04:00
Alan Rominger 03d97792ed Merge pull request #3640 from AlanCoding/3597_start_license 
Make validate_license common to all start access checks
 2016-10-03 14:13:58 -04:00
AlanCoding d734145c38 start capability to return False for manual projects 2016-10-03 11:41:42 -04:00
AlanCoding 3d38637b2d update migration name 2016-10-03 11:16:08 -04:00
AlanCoding 020c66f6ce make validate_license common to all can_start methods 2016-10-03 10:09:41 -04:00
AlanCoding b2fb7694dc Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-10-03 08:43:05 -04:00
AlanCoding 2faafa8071 Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-09-30 10:06:23 -04:00
AlanCoding 2776a56043 bump migration after another one was merged 2016-09-30 09:03:31 -04:00
Alan Rominger e8903456f8 Merge pull request #3616 from AlanCoding/capabilities_fixes 
Fixes to user_capabilities from QE bugs
 2016-09-28 16:29:42 -04:00
Alan Rominger 29308b08f0 Merge pull request #3571 from AlanCoding/3570_user_self_access_list 
Fix user access_list bug
 2016-09-28 16:20:04 -04:00
AlanCoding 2f205a6862 show capabilities on launch and relaunch, remove unintended capabilities 2016-09-28 16:02:00 -04:00
AlanCoding 37270bfb13 block system JT from being used in workflows 2016-09-28 15:14:27 -04:00
AlanCoding 78fc6df59d fix up the PATCH scenario with the char_prompts in WFJT node 2016-09-28 15:02:05 -04:00
AlanCoding 8036e294dd move vars validation method into validators.py 2016-09-28 09:49:17 -04:00
AlanCoding 166053e0eb Merge branch 'devel' into wf_rbac_prompt 2016-09-28 09:10:13 -04:00
AlanCoding 6f7e61a5be bump migration number 2016-09-28 09:09:26 -04:00
AlanCoding a452acf214 include scan job_type errors in criteria for rejecting workflow node prompts 2016-09-27 17:24:09 -04:00
AlanCoding fdca3b41ad copy WFJT node prompted fields to WJ nodes, reject or accept on unified job creation 2016-09-27 11:47:07 -04:00
AlanCoding 549273e90f unit test for node prompt values 2016-09-27 09:17:51 -04:00
AlanCoding 1604e2fd02 Workflow RBAC and prompting migration moved back to its own migration file 2016-09-26 16:57:23 -04:00
AlanCoding ca4f2eb005 fix bug where not all char_prompts were coppied to workflow job 2016-09-26 16:53:46 -04:00
AlanCoding dd477d8de8 workflow user_capabilities added 2016-09-26 13:26:43 -04:00
AlanCoding e6273ce46e Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-09-26 13:19:12 -04:00
AlanCoding 3951f63df5 add exception type to try-except for access_list details 2016-09-26 11:31:18 -04:00
AlanCoding 2f24d28638 fix bug where user content_object has no name attribute in access_list 2016-09-26 10:35:29 -04:00
Alan Rominger 64944393d3 Merge pull request #3505 from AlanCoding/can_CRUD 
Copy/edit rework
 2016-09-22 11:30:10 -04:00
AlanCoding 57abd438c8 make user_capabilities validation front-loaded, try to run tests 2016-09-22 10:36:30 -04:00
AlanCoding 9acd50b8f3 inject WF node prompts into new jobs, new workflow RBAC tests 2016-09-21 16:04:43 -04:00
AlanCoding 2ffa7a91ec Workflow RBAC and prompting basic changes 2016-09-20 17:16:26 -04:00
AlanCoding 766dac9663 flake8 fix and re-delete test_serializers 2016-09-15 17:23:24 -04:00
AlanCoding 7ff5c40564 Merge branch 'devel' of https://github.com/ansible/ansible-tower into can_CRUD 2016-09-15 17:19:38 -04:00
AlanCoding 113795bd40 remove can_copy and can_edit fields no longer used by UI 2016-09-15 16:32:56 -04:00
AlanCoding 0cb9ab3cf4 fix bugs due to lack of can_start access for some job types 2016-09-13 11:18:34 -04:00
AlanCoding 8075e3876e minor flake8 fixes to rbac_display file 2016-09-13 10:07:02 -04:00
Alan Rominger 43e399df81 Merge pull request #3370 from ansible/AlanCoding-patch-3 
test_credential bug fixes
 2016-09-13 09:56:43 -04:00
Alan Rominger 2e3982e295 Merge pull request #3393 from AlanCoding/role_description_optimization 
Avoid redundant lookups of content_type
 2016-09-13 09:56:03 -04:00
Alan Rominger 475c764162 Merge pull request #3319 from AlanCoding/proj_self_optimization 
Add another special case in summary_fields optimizations
 2016-09-13 09:53:22 -04:00
AlanCoding 0933a91174 Merge branch 'devel' into can_CRUD 2016-09-12 08:56:47 -04:00
AlanCoding d77dc271d8 copy/edit display test refactor, copy prefetch added 2016-09-09 15:13:48 -04:00
AlanCoding 507ba6a778 add new case in prefetch method for foreign-key roles 2016-09-08 15:03:55 -04:00
AlanCoding 6b0df43f3b add unattach field to user and team roles list 2016-09-08 11:09:17 -04:00
AlanCoding 9da00c2d38 RBAC copy/edit displays test refactor 2016-09-07 17:08:07 -04:00
AlanCoding 1ca7ce1bd4 JT OPTIONS based on RBAC, refactoring toward combinational prefetching 2016-09-02 17:07:42 -04:00
AlanCoding 0406431337 refactor step 2, move cacher to utils, generics ListView 2016-09-01 17:20:58 -04:00
Alan Rominger 2fada7a6ad fix flake8 2016-09-01 15:34:06 -04:00
AlanCoding 26ce3a4773 avoid lookup of content_type for description when summarizing object_roles 2016-09-01 15:08:32 -04:00
AlanCoding 398e9466f8 refactor step 1, get access_class within method 2016-09-01 15:05:33 -04:00
AlanCoding fa08c8d4bb wrap up some more implementation, and get caching seriously working 2016-08-31 16:53:47 -04:00
AlanCoding 953b192ff8 polishing of some remaining bugs 2016-08-30 16:56:57 -04:00
AlanCoding 766a7420a1 implement user capabilities in access_list 2016-08-30 15:42:52 -04:00
AlanCoding a32dd5b535 introduce summary_fields for users, showing user_capabilities 2016-08-30 14:02:57 -04:00
AlanCoding 0151967e9c selectively show POST in options for inventory sublists 2016-08-30 11:16:49 -04:00
AlanCoding cf81199bbf Remove extra project-related DB hit, follow same pattern as unified jobs 2016-08-30 10:12:12 -04:00
AlanCoding 381e8aacdd more organization of access method preprocessing 2016-08-29 16:57:30 -04:00
Alan Rominger 5e626cfe2e test_credential bug fixes 
Credential detail view was looked up with the organization's primary key. Works fine when the database arbitrarily gives them both pk=1 in a isolated test, but not a great thing to depend on.
 2016-08-29 15:54:45 -04:00
AlanCoding 23791cb91e Merge branch 'devel' of https://github.com/ansible/ansible-tower into can_CRUD 2016-08-29 14:01:18 -04:00
Alan Rominger f66fa6fb7c Merge pull request #3365 from AlanCoding/makefile_hot_fix 
fix error introduced in Makefile syntax
 2016-08-29 12:00:05 -04:00
AlanCoding 5f15b00a8a fix error Alan introduced in Makefile syntax 2016-08-29 11:46:16 -04:00
Alan Rominger f9cd0fe197 Merge pull request #3352 from AlanCoding/js_makefile 
Updating Jenkins UI targets, and pin pytest in devel
 2016-08-29 11:34:37 -04:00
AlanCoding 52dc28f7c5 jshint given desired commands, although not working 2016-08-29 11:32:42 -04:00
AlanCoding c6c295ef32 pin Dockerfile version as well 2016-08-29 09:50:57 -04:00
AlanCoding 8f1e9bd20d fields generally working as intended now 2016-08-26 17:05:52 -04:00
AlanCoding 1372623080 temporarily pin the pytest version until the ldap error can be fixed 2016-08-26 14:03:41 -04:00
AlanCoding 38879d339b flake8 fix 2016-08-26 13:57:35 -04:00
AlanCoding 3a86a41685 disable all the UI unit tests until things are sorted out 2016-08-26 13:51:49 -04:00
AlanCoding 260e93571e outright remove the old jshint install 2016-08-26 13:35:53 -04:00
AlanCoding 7cfb79110f updating Jenkins UI targets 2016-08-26 13:30:08 -04:00
AlanCoding e4504f789a intermediary state, not yet known to be working 2016-08-26 13:16:06 -04:00
Alan Rominger c87637ea7d Merge pull request #3325 from AlanCoding/temporary_pytest_bump 
Temporary pytest bump for tower unit tests
 2016-08-26 12:58:48 -04:00
AlanCoding 50ec9ca259 temporarily pin the pytest version until the ldap error can be fixed 2016-08-24 15:54:33 -04:00
AlanCoding 23024c8fad Make sure org admins can see credential after migration, comment updates on related tests 
add clause in test to verify automatic setting of org of new team credential
 2016-08-24 11:36:07 -04:00
Alan Rominger 75f513e591 Merge pull request #3324 from AlanCoding/3305_test_update 
Update team admin credential migration test
 2016-08-23 16:40:31 -04:00
AlanCoding bb3e370e56 Update team admin credential migration test to current state-of-knowledge 2016-08-23 14:14:48 -04:00
AlanCoding e461ff0144 Merge branch '2479' of github.com:AlanCoding/ansible-tower into can_CRUD 2016-08-22 15:47:48 -04:00
AlanCoding eddc1a8ed2 implement two methods for can_edit field for testing 2016-08-22 14:43:04 -04:00
Alan Rominger e5a1ee8b94 Merge pull request #3215 from AlanCoding/2200_job_survey_pass 
Save survey passwords in job as new field
 2016-08-12 14:04:29 -04:00
Alan Rominger b3c8333867 Merge pull request #3230 from ansible/AlanCoding-patch-1 
Allow for 201 callback status code
 2016-08-12 11:30:11 -04:00
AlanCoding ba101573d6 interpret any code below 300 as success 2016-08-12 11:25:16 -04:00
Alan Rominger 95011b1aa0 Merge pull request #3235 from AlanCoding/3234_ev_survey_fix 
Fix survey extra_vars processing error
 2016-08-12 10:17:40 -04:00
AlanCoding efb66cad20 bail when status code is over 300 2016-08-12 07:31:01 -04:00
Alan Rominger ae1af93551 Merge pull request #3242 from ansible/AlanCoding-patch-2 
Upgrade django debug toolbar requirement
 2016-08-11 13:14:01 -04:00