External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
9,087 Commits 65 Branches 102 Tags
f988877bae624c43ec431c16f0a9a2e6686b5fe5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
Alan Rominger 346564491f upgrade django toolbar requirement 2016-08-11 08:38:54 -04:00
Alan Rominger 9ab3aae59d Merge pull request #3225 from AlanCoding/3188_cheap 
The easy option to show inventory scripts to org auditors
 2016-08-10 16:10:08 -04:00
AlanCoding fab0ff18d8 add unit test for survey vars as strings 2016-08-10 11:02:29 -04:00
AlanCoding a94e97366a fix error processing survey vars 2016-08-10 09:41:04 -04:00
Alan Rominger c1e340fbd6 allow for 201 status_code from callback 2016-08-09 14:56:19 -04:00
AlanCoding 53d6d2734f add conditional to show inventory script to org auditors 2016-08-08 17:13:26 -04:00
Alan Rominger c36dafac3d Merge pull request #3181 from AlanCoding/tests_for_null_tags 
Add API test coverage for empty tags and skip_tags
 2016-08-08 16:48:47 -04:00
AlanCoding 6559118f40 tests for saving survey passwords to job 2016-08-08 13:06:07 -04:00
AlanCoding 9f3d9fa78a carry over survey passwords from old relaunched job 2016-08-05 15:59:11 -04:00
AlanCoding 17ac2cee42 Put survey passwords in job field 2016-08-05 15:11:28 -04:00
Alan Rominger 059c2b0830 Merge pull request #3191 from AlanCoding/job_schema 
Fix error in job schema introduced in ask_skip_tags PR
 2016-08-03 14:20:17 -04:00
AlanCoding 2955af705e fix error in job schema introduced in ask_skip_tags change 2016-08-03 11:37:11 -04:00
AlanCoding d6c4c12c32 add API test coverage for empty tags and skip_tags 2016-08-02 10:43:51 -04:00
Alan Rominger eeda3ce4a1 Merge pull request #3173 from AlanCoding/3115_ask_skip_tags 
Add ask_skip_tags
 2016-08-02 10:21:03 -04:00
AlanCoding c6ecdbbfc1 remove unrelated field from ask_skip_tags_on_launch migration and update 
migration and access.py changes to not conflict with other changes
 2016-08-02 10:04:49 -04:00
AlanCoding bedcdadcfc job launch read_only fields made more clear 2016-08-01 16:49:35 -04:00
AlanCoding 0271aa611c add field to JT for asking to skip tags 2016-08-01 16:49:34 -04:00
Alan Rominger 16959ef17d Merge pull request #3171 from AlanCoding/2567_AS_group_inv 
Show inventory_id in activity stream for groups
 2016-08-01 15:40:47 -04:00
Alan Rominger 1352fe822d Merge pull request #3172 from AlanCoding/3118_role_read 
Drop in visible_roles to RoleAccess can_read
 2016-08-01 15:40:21 -04:00
Alan Rominger d2c040439e Merge pull request #3166 from AlanCoding/3163_host_box 
Allow POST box for host list to show
 2016-08-01 10:12:47 -04:00
AlanCoding 5dbbaf4105 add code to HostAccess can_add so the browsable API will work 2016-07-29 12:02:40 -04:00
Alan Rominger a078254508 Merge pull request #3157 from AlanCoding/3129 
Protect NotFound error in POST to TeamRoles
 2016-07-28 20:20:00 -04:00
AlanCoding 1fb173b2e5 RoleTeam and TeamRole sublist NotFound exception handling and test update 2016-07-28 16:01:42 -04:00
Alan Rominger 2895c9fe9c Merge pull request #3150 from AlanCoding/3146_org_admin_sys_aud 
Limit creation of system auditors to superusers
 2016-07-27 17:16:39 -04:00
AlanCoding 945635eb70 also limit creation of system auditors to superusers 
squash
 2016-07-27 17:02:08 -04:00
Alan Rominger 0c8946702c Merge pull request #3139 from AlanCoding/3096_show_sys_JT 
Show system JTs in the UJT list
 2016-07-27 14:21:24 -04:00
AlanCoding 1d951a7eff use same model method to determine read permission as we do in the views 2016-07-27 12:13:38 -04:00
AlanCoding 32a9c812e3 special case filter to show inventory id for group 2016-07-27 11:48:22 -04:00
AlanCoding e27ce600c5 add system job templates to the unified JT list 2016-07-27 10:28:53 -04:00
AlanCoding 2d2b426374 add read_role to organization select_related 2016-07-25 17:39:19 -04:00
Alan Rominger f5fa53d89a Merge pull request #3098 from AlanCoding/3033_AS_updates 
Reorganize activity stream access around org admin/auditors (3.0.2)
 2016-07-25 11:04:05 -04:00
Alan Rominger 4b3f1d44de Merge pull request #3105 from AlanCoding/new_job_cancel 
Fixes for "new" job things in 3.0.1
 2016-07-22 16:13:39 -04:00
AlanCoding 94c8dfd506 Allow instant cancel for new jobs 2016-07-22 15:49:24 -04:00
AlanCoding 4bea2aa627 Show new jobs in UI Jobs tab 2016-07-22 15:48:37 -04:00
AlanCoding 6fee46fb66 Reorganize activity stream around org admin/auditors 2016-07-22 12:50:14 -04:00
Alan Rominger 49b8fc4003 Merge pull request #3070 from AlanCoding/3063_ui 
Show "new" jobs in UI Jobs tab (UI 3.0.1)
 2016-07-21 16:24:41 -04:00
Alan Rominger 03a24da2e1 Merge pull request #3061 from AlanCoding/3038_UJT_301 
Pass context into unified Job, Job Template, and Job List serializers (API 3.0.1)
 2016-07-21 11:58:26 -04:00
Alan Rominger 07a1f4bee2 Merge pull request #3062 from AlanCoding/3037_orphan_proj 
orphan project protection in job delete access (API 3.0.1)
 2016-07-21 11:57:58 -04:00
Alan Rominger 9513a14ac6 Merge pull request #3068 from AlanCoding/3063_cancel_flag 
Allow instant cancel for new jobs (API 3.0.1)
 2016-07-21 11:57:40 -04:00
AlanCoding efff0d68b5 Show new jobs in UI Jobs tab 2016-07-21 11:37:10 -04:00
AlanCoding 7e49a428e6 Allow instant cancel for new jobs 2016-07-21 09:05:32 -04:00
AlanCoding fc96952084 orphan project protection in job delete access 2016-07-20 10:21:38 -04:00
AlanCoding 29e35357e9 pass context into Job and JobList serializer classes 2016-07-20 10:02:59 -04:00
AlanCoding f154633277 pass context to unified job template subclasses 2016-07-20 10:02:09 -04:00
Alan Rominger 94e39b0cee Merge pull request #3015 from AlanCoding/org_read_role 
Add read_role to organization select_related
 2016-07-15 15:32:04 -04:00
Alan Rominger 3b972e871d Merge pull request #3014 from AlanCoding/migration_touchup 
Switch order in migration 0026
 2016-07-14 16:49:28 -04:00
AlanCoding df940f811c add read_role to organization select_related 2016-07-14 16:11:29 -04:00
AlanCoding 2876bb169b switch order in migration 2016-07-14 15:49:24 -04:00
Alan Rominger 7f168c7fe4 Merge pull request #3003 from AlanCoding/2988_team_cascade 
Cascade delete teams from organization
 2016-07-14 15:13:46 -04:00
Alan Rominger 149e7375c0 Merge pull request #3011 from AlanCoding/docker_atomic 
Make development environment use ATOMIC_REQUESTS
 2016-07-14 15:07:47 -04:00
AlanCoding 06c37d39ef Make development environment use ATOMIC_REQUESTS 2016-07-14 14:43:25 -04:00
AlanCoding 68d5a702af Team organization field made non-null 2016-07-14 14:38:43 -04:00
AlanCoding 994a72967d Cascade delete teams when their organization is deleted 2016-07-14 11:44:43 -04:00
Alan Rominger 7a08f37132 Merge pull request #2945 from AlanCoding/2944_inv_script_orphan_sys_aud 
Allow system auditors to see orphan inventory scripts
 2016-07-12 16:46:29 -04:00
Alan Rominger 562b202fca Merge pull request #2951 from AlanCoding/role_user_wording 
/roles/N/users/ error message correction
 2016-07-12 16:21:44 -04:00
AlanCoding 646f848cfb fix incorrect error message 2016-07-12 15:46:48 -04:00
AlanCoding 15f06ec9d3 allow system auditors to see orphan inventory scripts 2016-07-12 15:03:33 -04:00
Alan Rominger cb6035140b Merge pull request #2933 from AlanCoding/notifier_org_auditor 
Allow org auditors to see notifications
 2016-07-12 13:10:56 -04:00
AlanCoding 36286bcda2 notifier rbac test made consistent with others 2016-07-12 11:16:55 -04:00
AlanCoding 0fcc9abd69 allow org auditors to see notifications 2016-07-12 10:30:44 -04:00
Alan Rominger 18bc32d248 Merge pull request #2930 from AlanCoding/2929_org_auditors_NT 
Allow org auditors to view notification templates
 2016-07-12 09:32:51 -04:00
AlanCoding f68495cf58 allow org auditors to view notification templates 2016-07-12 09:18:04 -04:00
Alan Rominger feb94139c4 Merge pull request #2924 from AlanCoding/leftover_related 
Add missing roles to select_related
 2016-07-11 17:06:03 -04:00
AlanCoding 1b613d919b include all roles in the select_related 2016-07-11 16:51:29 -04:00
Alan Rominger c8b8cdf7f5 Merge pull request #2906 from AlanCoding/2875_old_launch 
Fix old method of launching jobs by directly raising validation errors
 2016-07-11 12:46:23 -04:00
AlanCoding 3e433dc9f3 Remove old method of appending errors because it makes attrs None, causing server errors 2016-07-11 11:27:08 -04:00
Alan Rominger fbde6355bf Merge pull request #2880 from AlanCoding/2870_null_data_access 
Browseable API POST box fixes
 2016-07-08 15:30:18 -04:00
AlanCoding 5027027aba update behavior of access.py to newer DRF, display POST box for most list endpoints 2016-07-08 15:18:40 -04:00
Alan Rominger ace2f1e207 Merge pull request #2846 from AlanCoding/2842_proj_api 
Show the project list POST text box for org admins in API browser
 2016-07-07 15:30:46 -04:00
AlanCoding 94c4db1d6a Show the project list POST text box for org admins in API browser 2016-07-07 14:05:09 -04:00
Alan Rominger 4fce29fe1d Merge pull request #2830 from AlanCoding/2828_proj_AS 
M2M fix for project activity stream
 2016-07-07 10:56:41 -04:00
AlanCoding 25c177cdcd M2M fix for project activity stream 2016-07-07 10:24:50 -04:00
Alan Rominger 9476bc12e9 Merge pull request #2787 from AlanCoding/2733_credential_org_access 
Processing of "organization" related field in credential can_change
 2016-07-06 15:43:17 -04:00
AlanCoding 5df846eb0a remove unnecessary fixture from org_credential 2016-07-06 15:21:57 -04:00
Alan Rominger 70b9a48f82 Merge pull request #2739 from AlanCoding/2735_proj_access 
Do not allow creating projects as foreign org admin
 2016-07-06 15:09:43 -04:00
AlanCoding ddbe54f841 allow null data cases in credential can_change 2016-07-05 15:06:40 -04:00
AlanCoding c21d560cfd Credential can_change updates for organization related field 2016-07-05 14:04:52 -04:00
Alan Rominger 76d3ae7023 Merge pull request #2740 from AlanCoding/revert_access_list 
Revert "Merge pull request #2444 from AlanCoding/2364_access_list_res…
 2016-07-01 10:56:11 -04:00
AlanCoding 07bea4c8b0 Revert "Merge pull request #2444 from AlanCoding/2364_access_list_restriction" 
This reverts commit b71307bf91d1f1a9337071e04ecced012826584b, reversing
changes made to 1be12482954b680ba7a55746594a7e29df9b178d.
 2016-07-01 10:10:00 -04:00