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

11852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III
1d74b4ea9b Merge pull request #5551 from wwitzel3/release_3.1.0 
run clustered as privleged to avoid namespace error
 2017-02-24 11:19:28 -05:00
Wayne Witzel III
50f187b78c run clustered as privleged to avoid namespace error 2017-02-24 11:12:39 -05:00
Matthew Jones
1a946d51c1 Fix an issue with sync vs run project updates 
We need to not remove the source tree on project update run which
happens in the context of the job run to prevent the directory from
being deleted out from under the job runners. Since those will
inherently not block each other as the project update would
 2017-02-24 11:03:48 -05:00
jlmitch5
d8151b05b8 Merge pull request #5550 from jlmitch5/fixCancelOnNonPBDetailPages 
fix cancel on non playbook detail pages
 2017-02-24 11:03:18 -05:00
John Mitchell
30de9569ee fix cancel on non playbook detail pages 2017-02-24 10:31:37 -05:00
Chris Meyers
bdbd2a9712 Merge pull request #5548 from chrismeyersfsu/fix-blunder 
fix up nightlies
 2017-02-24 10:28:50 -05:00
Chris Meyers
2f604f30d9 host may be None, account for that 2017-02-24 09:59:52 -05:00
Chris Meyers
fe3d79b5ec Revert "Merge pull request #5527 from chrismeyersfsu/fix-log_settings" 
This reverts commit 3db0242ef9a8b1ce67e159b8a19e0c1e70330b7c, reversing
changes made to e6893bb7f3cf696c202c39103b432c20afa6ec08.
 2017-02-24 09:59:34 -05:00
Michael Abashian
3b489977a0 Merge pull request #5543 from jaredevantabor/host-event-stdout 
Host event stdout styling
 2017-02-24 09:28:19 -05:00
jaredevantabor
8ce09d1b6d styling for host event stdout 2017-02-23 19:46:29 -08:00
Jared Tabor
3fff094d6e Merge pull request #5535 from jaredevantabor/ctit-reset 
CTiT Revert All
 2017-02-23 17:00:48 -08:00
jaredevantabor
9ba11c870a reset all 2017-02-23 15:34:45 -08:00
Ryan Petrello
7ad819649c Merge pull request #5531 from ryanpetrello/fix-5470 
retain the default interstitial value for TOWER_URL_BASE
 2017-02-23 16:55:08 -05:00
Ryan Petrello
5dfdef6e6b retain the default interstitial value for TOWER_URL_BASE 
to support #5470, check for the presence of this special interstitial
value and replace it with the request hostname for settings OPTIONS
requests
 2017-02-23 16:38:16 -05:00
Matthew Jones
fd7c2550ee Fix a potential security issue in revision storage path name 
It's too stable and could lead to a race condition
 2017-02-23 16:21:13 -05:00
Chris Meyers
4e65e6624a Merge pull request #5527 from chrismeyersfsu/fix-log_settings 
prevent traceback when host is set to null/None
 2017-02-23 15:52:32 -05:00
Chris Meyers
1b069a5cd1 Merge pull request #5528 from chrismeyersfsu/fix-rectifier 
fix check running status
 2017-02-23 15:52:05 -05:00
Chris Meyers
50a8083984 flake8 2017-02-23 15:41:41 -05:00
John Mitchell
2e0597b13f fix permissions disabled tooltip wording 2017-02-23 15:14:52 -05:00
Chris Meyers
08825a1f49 fix check running status 2017-02-23 15:09:50 -05:00
John Mitchell
3fe444374b only call processEvent within the buffer 2017-02-23 14:57:02 -05:00
Chris Meyers
2953479dc8 correct behavior of tower_uuid logging setting 
* Register a default=function() with LOG_AGGREGATOR_TOWER_UUID. We know
this function will ONLY be called when there is no database backed
settings. Therefore, we set a one-time uuid at this time.
* The user is free to change LOG_AGGREGATOR_TOWER_UUID.
* The user may not set this field to null
* The user may not set this field to ''
 2017-02-23 14:31:47 -05:00
Chris Meyers
0b04001b15 host may be None, account for that 2017-02-23 14:31:24 -05:00
Ryan Petrello
05e1348ef9 Merge pull request #5521 from ryanpetrello/fix-4975 
allow AD_HOC_COMMANDS to be set to [] in the settings ui
 2017-02-23 14:18:02 -05:00
Ryan Petrello
7a8089681e Merge pull request #5524 from ryanpetrello/fix-4931 
always refetch license config
 2017-02-23 14:17:33 -05:00
Ryan Petrello
28dd2d3407 Merge pull request #5522 from ryanpetrello/fix-5094 
allow idempotent save when editing an inventory script
 2017-02-23 12:47:39 -05:00
Ryan Petrello
b7e48c437d always refetch license config 
see: #4931
 2017-02-23 12:22:44 -05:00
Ryan Petrello
0c0f3b236f allow idempotent save when editing an inventory script 
see: #5094
 2017-02-23 11:34:04 -05:00
Ryan Petrello
fc583ead21 allow AD_HOC_COMMANDS to be set to [] in the settings ui 
see: #4975
 2017-02-23 10:51:54 -05:00
Ryan Petrello
e1c2a06246 Merge pull request #5518 from ryanpetrello/fix-4979 
move a tall tooltip's placement on the credentials UI to avoid cutoff
 2017-02-23 10:20:02 -05:00
Jared Tabor
fca5e1975a Merge pull request #5516 from jaredevantabor/host-event-stdout 
Fixing host event stdout/stderr
 2017-02-23 07:12:19 -08:00
Ryan Petrello
6b75ed3dcb move a tall tooltip's placement on the credentials UI to avoid cutoff 
when browser text size is increased, this tooltip gets cut off at the
top of the browser window

see: #4979
 2017-02-23 09:48:52 -05:00
jaredevantabor
a62d1b8437 fixing host event stdout (it should pull from host-event.res) 2017-02-22 17:25:44 -08:00
Alan Rominger
0bdcfbb33e Merge pull request #5512 from AlanCoding/inv_src_qs 
Add InventorySource back into schedule queryset
 2017-02-22 17:01:11 -05:00
Matthew Jones
b43a354bca Merge branch 'improve_ujt_filter_aliases' into release_3.1.0 
* improve_ujt_filter_aliases:
  Alias unified job template search fields for presentation
 2017-02-22 16:59:56 -05:00
Alan Rominger
1f0b3876cc Merge pull request #5506 from AlanCoding/no_bad_names 
More gutting of related_search_fields in 3.1 scope
 2017-02-22 16:52:56 -05:00
jlmitch5
70b826fecb Merge pull request #5513 from jlmitch5/stylingJobResults 
fix job results styling
 2017-02-22 16:40:35 -05:00
Jared Tabor
87a3481fcb Merge pull request #5514 from jaredevantabor/defaults-null-pointer-exception 
Extra check to prevent console error
 2017-02-22 13:19:30 -08:00
jaredevantabor
b724abb684 adding a check to prevent a console error due to null pointer 2017-02-22 13:11:20 -08:00
John Mitchell
4c665171ed fix job results styling 2017-02-22 15:52:24 -05:00
AlanCoding
d85eda99c6 add back in Inv Src into schedule queryset computation 2017-02-22 15:34:18 -05:00
Matthew Jones
b14336bdff Alias unified job template search fields for presentation 
The polymorphic accessors have a name that is different than our
normal presentation name for these types. This aliases them for the
presentation layer and then handles processing them when they are
given as filters.
 2017-02-22 15:33:47 -05:00
Jared Tabor
0a25b286ca Merge pull request #5509 from jaredevantabor/missing-project-jt 
Deleting underlying project from a JT fix
 2017-02-22 12:15:06 -08:00
Michael Abashian
a484dae41a Fix for deleting search tags on job details 2017-02-22 14:59:54 -05:00
jaredevantabor
30951f4b31 fix for setting scan job template project/playbook 
the logic for a scan job was also getting caught for a run job w/ a missing project
 2017-02-22 11:58:37 -08:00
jlmitch5
365659051e Merge pull request #5474 from jlmitch5/fixRecentJobRunsList 
include workflows on dashboard recent job runs list
 2017-02-22 14:37:00 -05:00
Jared Tabor
d56317a161 Merge pull request #5500 from jaredevantabor/ctit-reset 
[CTiT] Reverting All The Things
 2017-02-22 10:59:23 -08:00
jlmitch5
6c799325c8 Merge pull request #5497 from jlmitch5/fixJobResultsRaceCondition 
Fix job results race condition
 2017-02-22 13:56:46 -05:00
John Mitchell
105a926abe also remove line from karma config coz chris meyers is an idiot 2017-02-22 13:45:43 -05:00
John Mitchell
78dab3741d accidentally messed up karma config, reverting 2017-02-22 13:44:56 -05:00