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

8828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones
3e1c0111f5 Merge branch 'api_release_3.0.1' into release_3.0.2 
* api_release_3.0.1:
  add code to HostAccess can_add so the browsable API will work
  update unit tetsts
  use get_object_or_400 to fetch Role
  refactor to unit tests
  restrict User.admin_role membership changes through RoleUsersList
  fix test
  do not allow membership changes to User.admin_role
  RoleTeam and TeamRole sublist NotFound exception handling and test update
  add system job templates to the unified JT list
  Reorganize activity stream around org admin/auditors
  Allow instant cancel for new jobs
  orphan project protection in job delete access
  pass context into Job and JobList serializer classes
  pass context to unified job template subclasses
  Allow auditors to see same /api/v1/config information as admins
 2016-08-01 13:23:37 -04:00
Matthew Jones
0189cd3d0c Bump version for 3.0.2 2016-08-01 11:55:30 -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
Wayne Witzel III
27470b0648 Merge pull request #3160 from wwitzel3/api_3.0.1 
do not allow membership changes to User.admin_role
 2016-07-29 12:37:26 -04:00
AlanCoding
5dbbaf4105 add code to HostAccess can_add so the browsable API will work 2016-07-29 12:02:40 -04:00
James Laska
4e93475be1 Merge branch 'release_3.0.1' into stable 2016-07-29 11:31:50 -04:00
Wayne Witzel III
b862a13d92 update unit tetsts 2016-07-29 11:30:33 -04:00
Wayne Witzel III
9baa9594c7 use get_object_or_400 to fetch Role 2016-07-29 11:29:49 -04:00
Wayne Witzel III
b127e74ae4 refactor to unit tests 2016-07-29 11:29:43 -04:00
Wayne Witzel III
52865eea6a restrict User.admin_role membership changes through RoleUsersList 2016-07-29 11:29:41 -04:00
Wayne Witzel III
a431ac7854 fix test 2016-07-29 11:29:39 -04:00
Wayne Witzel III
06bb8871d7 do not allow membership changes to User.admin_role 2016-07-29 11:29:36 -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
Graham Mainwaring
951d8e1555 Check that venv is activated before loading wsgi app (#3148) 
Check that venv is activated before loading wsgi app
 2016-07-28 10:31:29 -04:00
Jared Tabor
3a66c83e7c Merge pull request #3151 from jaredevantabor/O-auth 
Make check for idle session more specific
 2016-07-27 14:22:42 -07: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
Jared Tabor
45e506ec0f Make check for idle session more specific 
in order to avoid collision with a social auth session's startup.
 2016-07-27 13:52:26 -07: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
e27ce600c5 add system job templates to the unified JT list 2016-07-27 10:28:53 -04:00
James Laska
f53a1b8f6c Use foreman.id instead 
foreman.uuid isn't always present
 2016-07-27 10:18:31 -04:00
Wayne Witzel III
3e0d9e4d03 Merge pull request #3126 from wwitzel3/3.0.1 
Restrict what roles you can assign to teams.
 2016-07-27 09:50:26 -04:00
Wayne Witzel III
a0c563e831 flake8 fixups 2016-07-26 14:50:48 -04:00
Wayne Witzel III
df1464d4bf fixing tests for new team role assignment restrictions 2016-07-26 12:10:19 -04:00
Wayne Witzel III
74b013aad0 driveby cleanup 2016-07-26 12:09:58 -04:00
Wayne Witzel III
9bad20cee3 do not allow assignment of system roles or user.admin_role to teams 2016-07-26 12:09:36 -04:00
James Laska
13bd9211ae Add copyright back with utf-8 encoding 
Fixes encoding exception
 2016-07-25 15:18:10 -04:00
James Laska
11d68d1ebe Complete Sat6 integration 
Various fixes to get sat-6 integration working.

* inventory_import.py - the inventory script is called foreman.py
* tasks.py - be sure to call `add_section()` before using it
* defaults.py - Add various SATELLITE6_* enablement variables

Relates #3119
 2016-07-25 15:13:39 -04:00
Matthew Jones
60e012f75b Force requests to emit application/json 
When sending webhook notifications
 2016-07-25 12:46:12 -04:00
Graham Mainwaring
30ed7b487b Merge pull request #3112 from ghjm/scl_install_rhel_rhsm 
Enable software collections repo on RHEL 6 + RHSM
 2016-07-25 12:22:35 -04:00
James Laska
f1c4a919bc Merge pull request #3117 from wwitzel3/3.0.1 
fix issue with rbac_migrations logger
 2016-07-25 12:15:53 -04:00
Wayne Witzel III
81c4a82db8 fix issue with rbac_migrations logger 2016-07-25 11:22:50 -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
Akita Noek
eeaa325b10 Merge pull request #3108 from anoek/3107 
Fixed credential migration issue involving null inventory fields in job templates
 2016-07-25 09:43:58 -04:00
Akita Noek
94052c2b2b Fixed credential migration issue involving null inventory fields in job templates 
Don't attempt to derive credential organization information from a job
template when the inventory field is null for that job template

 #3107
 2016-07-22 16:44:00 -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
Chris Meyers
a1b29d8f4b Merge pull request #3087 from chrismeyersfsu/fix-migration_log 
log migration to standard tower log dir
 2016-07-22 13:10:42 -04:00
Chris Meyers
e5b031e533 use existing logging infrastructure 2016-07-22 12:52:25 -04:00
AlanCoding
6fee46fb66 Reorganize activity stream around org admin/auditors 2016-07-22 12:50:14 -04:00
Chris Meyers
b6ff1d8c21 Merge pull request #3092 from chrismeyersfsu/remove-label_cleanup_job 
forgot to remove label cleanup periodic task
 2016-07-22 12:20:27 -04:00
Chris Meyers
6ea24dea34 Merge pull request #3091 from chrismeyersfsu/fix-#2847 
Always create fact cleanup job
 2016-07-22 12:14:20 -04:00
Chris Meyers
32229e1af8 Merge pull request #3080 from chrismeyersfsu/fix-superuser_license_host_add 
check license permission on host create
 2016-07-22 11:47:41 -04:00
Akita Noek
50ada022b5 Merge pull request #3082 from anoek/3077 
Fixed the need for elevated permissions to make changes to job templates under some scenarios
 2016-07-22 10:55:51 -04:00
Chris Meyers
c42af3c61a forgot to remove label cleanup periodic task 2016-07-22 10:33:30 -04:00
Akita Noek
64d653bc61 Equate '' to None for foreign key references when PUTing to a job template 
The UI will sometimes send an empty string instead of null, we already
handle this in our serializer and treat it as null, so this change
brings our access system in line with the expectation that those two
things should be equal.

 Possibly related to #3077
 2016-07-22 10:11:33 -04:00
Chris Meyers
eb89cf98cc Always create fact cleanup job 2016-07-22 10:05:00 -04:00
Chris Meyers
811d6dfe3d add missed log and fix dev env 2016-07-22 10:04:02 -04:00