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

8800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Chris Meyers
fd098e64dc log migration to standard tower log dir 2016-07-22 09:29:07 -04:00
Akita Noek
5bce9ee215 If you have use_role on an inventory, make it so you can use it in scan jobs 
#3077
 2016-07-21 17:22:11 -04:00
Chris Meyers
4cf7344dc4 check license permission on host create 2016-07-21 16:53:25 -04:00
Chris Meyers
46998cdcfe Merge pull request #3075 from chrismeyersfsu/fix-fact_migration_performance 
do not cache mongo records
 2016-07-21 15:12:00 -04:00
Chris Meyers
d886d07364 do not cache mongo read data on migration 2016-07-21 15:11:16 -04:00
Akita Noek
203279bef1 Merge pull request #3069 from anoek/3067 
Fix migration problems with inventoryless job templates
 2016-07-21 11:43:15 -04:00
Matthew Jones
495115af6a Bump version number for 3.0.1 release 2016-07-21 10:51:44 -04:00
Akita Noek
de9ae86ecc Fix migration problems with inventoryless job templates 
#3067
 2016-07-21 10:35:43 -04:00
Matthew Jones
3ab8a93461 Merge branch 'release_3.0.0' into stable 
* release_3.0.0: (2364 commits)
  remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058)
  fix missing URI encoding in event summary serch, kickback on #2980 (#3050)
  Switch base class for StateConflict
  Fixed password show/hide on enter for survey maker password type previews
  Fixed password show/hide on enter for survey taker survey questions where type is password
  Prevent populate_user from being registered multiple times.
  Fixing iterator used when jobs list refreshes
  Explicit super user check for JT can_delete
  Fix for populating teams for LDAP user.
  Update hubspot template for marketting
  Fix up flake8
  Rolled back the onExit solution previously implemented to handle the backspace navigation on the job launch modal.  New solution listens for state changes within the directive and cleans itself up.
  Switch disallowed object delete to 409
  Password enter show/hide fix
  add test for CustomInventoryScript serializer
  Fixed bug where hitting enter in a password field in the job launch/survey maker modal would toggle the show/hide.
  Setting the local var CredentialList to the deep clone seems to be problematic.  Moving this out so that the original object itself is overwritten which is how it's done in other places. (#3017)
  Jobs list page size (#3019)
  resolves kickback on #2980 (#3008)
  Use the correct yum attribute name
  ...
 2016-07-18 20:40:13 -04:00
Leigh Johnson
62e5defac3 remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058) 2016-07-18 15:34:59 -04:00
Leigh Johnson
c0e02f4a65 fix missing URI encoding in event summary serch, kickback on #2980 (#3050) 2016-07-18 13:34:53 -04:00
Matthew Jones
b587b892b0 Switch base class for StateConflict 
This fixes the output format for the 409 exception return
 2016-07-18 12:29:51 -04:00
Michael Abashian
ec2cb9a3cc Merge pull request #3045 from mabashian/password-show-hide 
Fixed password show/hide on enter for survey taker password
 2016-07-18 12:24:25 -04:00
Michael Abashian
5894e5eb65 Fixed password show/hide on enter for survey maker password type previews 2016-07-18 10:55:18 -04:00
Michael Abashian
43fc454a95 Fixed password show/hide on enter for survey taker survey questions where type is password 2016-07-18 10:35:57 -04:00
Chris Church
cb98d0674d Prevent populate_user from being registered multiple times. 2016-07-15 16:24:41 -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
Wayne Witzel III
03c3ac074c Merge pull request #3022 from wwitzel3/issue-2979 
Fix sysadmin and sysauditor viewing orphan inventory script.
 2016-07-15 15:26:33 -04:00
Jared Tabor
29132929de Merge pull request #3025 from jaredevantabor/jobs-list-page-size 
Fixing iterator used when jobs list refreshes
 2016-07-15 11:56:19 -07:00