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,825 Commits 54 Branches 19 Tags
Commit Graph

8825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III
720eb8d6fb adding more credential parsing coverage 2016-08-02 10:39:16 -04:00
Wayne Witzel III
da0b8ad2ff moving from old to unit folder 2016-08-02 10:39:02 -04:00
Matthew Jones
572f62e22a Merge branch 'stable' into devel 
* stable: (30 commits)
  Remove ansible-tower.repo during packer cleanup
  Update package changelogs
  Enable SE boolean httpd_execmem
  Check that venv is activated before loading wsgi app (#3148)
  also limit creation of system auditors to superusers
  Make check for idle session more specific
  Use foreman.id instead
  flake8 fixups
  fixing tests for new team role assignment restrictions
  driveby cleanup
  do not allow assignment of system roles or user.admin_role to teams
  Add copyright back with utf-8 encoding
  Complete Sat6 integration
  Force requests to emit application/json
  fix issue with rbac_migrations logger
  Enable software collections repo on RHEL 6 + RHSM
  Fixed credential migration issue involving null inventory fields in job templates
  Allow instant cancel for new jobs
  Show new jobs in UI Jobs tab
  use existing logging infrastructure
  ...
 2016-08-01 11:51:26 -04:00
James Laska
4e93475be1 Merge branch 'release_3.0.1' into stable 2016-07-29 11:31:50 -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
Michael Abashian
1d84139030 Merge pull request #3143 from mabashian/1790-smart-status-vert-align 
Vertically center smart status icons if they are all of one type
 2016-07-28 09:31:28 -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
Michael Abashian
3e5244821f Vertically center smart status icons if they are all of one type 2016-07-27 13:30:12 -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
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
7c16c8c6e7 Merge pull request #3103 from chrismeyersfsu/fix-travis_network_cred_test 
fixes network cred failure in travis
 2016-07-22 15:47:54 -04:00
Chris Meyers
c7524892c0 fixes network cred failure in travis 2016-07-22 15:36:08 -04:00
Chris Meyers
564aa86bd5 Merge pull request #3101 from chrismeyersfsu/fix-fact_version_get_param_ordering 
fix travis
 2016-07-22 15:08:03 -04:00
Chris Meyers
37ddf2a4d9 fix unit test on travis 2016-07-22 14:00:28 -04:00
James Laska
2a791b8e90 Merge pull request #3099 from jlaska/tox 
Add travis-ci integration using tox
 2016-07-22 13:56:26 -04:00
James Laska
1f9df1fdf3 Default to not running old tests 2016-07-22 13:19:57 -04:00
James Laska
77202ec696 Only run unit and function tests 2016-07-22 13:19:57 -04:00
James Laska
29778538c3 Be sure to install ansible 
Enable the mongodb travis service too
 2016-07-22 13:19:57 -04:00
James Laska
6140c8c500 Additional travis/tox tweaks 
* Enable travis caching
* Disable coverage after_build
* Call setup.py develop first
* Include pytest config and enable skipsdist
 2016-07-22 13:19:57 -04:00
Shane McDonald
5c516b60b3 ¯\_(ツ)_/¯ 
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
 2016-07-22 13:19:57 -04:00
James Laska
f3c186310b First pass at getting tox and travis working 2016-07-22 13:19:57 -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