External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-14 07:50:09 -02:30
Code Issues Packages Projects Releases Wiki Activity
20,381 Commits 64 Branches 102 Tags
6e8809fe72ebdba6bbcf098d6f1cc823ab9f080b
Commit Graph
20381 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Petrello a75da0fd58 Merge branch 'release_3.3.0' into fixTokenScopeAddInUI 2018-05-30 10:18:56 -04:00
AlanCoding 4e6fd59180 Handle broken transactions in DB settings getattr 
This expands the role of the log database error context manager
and will actually make itself an exception to the standard
ORM behavior of raising an error when any queries are executed
inside of a broken transaction.

In this particular case it is less risky to continue on
with a database query and push the data to memcache than
it would be to use default settings values in violation of
user's intent. (hopefully)
 2018-05-30 09:00:03 -04:00
Pierre-Louis Bonicoli a752d04505 ansible venv: re-add netaddr Python package 
Closes #1763
 2018-05-30 02:01:03 +02:00
Marliana Lara 4c9ceb48a1 Merge pull request #1981 from marshmalien/fix/1886-job-details-credential 
Add credential tags to job details
 2018-05-29 17:27:23 -04:00
Marliana Lara 4f90391f54 Fix dashboard graph status dropdown value 2018-05-29 17:25:09 -04:00
Marliana Lara 5d0a131530 Add credential tags to job details 2018-05-29 16:29:14 -04:00
Ryan Petrello a3aad31be3 Merge pull request #1964 from ryanpetrello/fix-token-scope 
fix a few minor issues that have broken the User Token creation
 2018-05-29 15:10:17 -04:00
John Mitchell 0f6fe210b7 fix when token scope is passing when the ui saves the form 2018-05-29 15:04:25 -04:00
Jake McDermott d01940ffc5 Merge pull request #1965 from jakemcdermott/double-search 
Fix wording of smart search key
 2018-05-29 14:31:14 -04:00
Jake McDermott 9d87f85275 fix wording of search keys 2018-05-29 14:14:47 -04:00
Alan Rominger 232ad2a06c Merge pull request #1912 from AlanCoding/other_user_relaunch 
Disallow launching jobs with other user's prompts
 2018-05-29 11:51:13 -04:00
Ryan Petrello b6d450923a Merge pull request #1972 from ryanpetrello/i-am-not-a-smart-man 
use the _correct_ argument to specify poll vs select
 2018-05-29 11:31:51 -04:00
Chris Meyers f1083540a3 Merge pull request #1971 from chrismeyersfsu/fix-cached_dependency_list 
do not cache dependency_list
 2018-05-29 11:27:59 -04:00
Ryan Petrello c369d44518 use the _correct_ argument to specify poll vs select 2018-05-29 11:25:08 -04:00
Ryan Petrello 238ffe5e7e Merge pull request #1969 from ryanpetrello/better-pexpect-poll 
upgrade to the latest pexpect
 2018-05-29 10:35:29 -04:00
chris meyers 4da68564ef do not cache dependency_list 
* This is probably causing some bug. Calls to start_task within the same
run of the task manager could result in previous dependency lists being
used.
 2018-05-29 10:27:51 -04:00
Ryan Petrello 7f7f635f7b upgrade to the latest pexpect 
see: https://github.com/pexpect/pexpect/pull/492
see: https://github.com/ansible/tower/issues/1797
 2018-05-29 09:52:59 -04:00
Ryan Petrello af7ec17ccd fix a few minor issues that have broken the User Token creation 
see: https://github.com/ansible/tower/issues/1928
 2018-05-25 17:37:02 -04:00
Ryan Petrello 0fca495792 Merge pull request #1961 from ryanpetrello/fix-1672 
don't allow Accept:application/json on /api/login/
 2018-05-25 16:55:11 -04:00
Ryan Petrello fc1077b9cb Merge pull request #1962 from ryanpetrello/i18n-credentials 
mark dynamic Credential Type labels and help_text for i18n
 2018-05-25 16:31:09 -04:00
Ryan Petrello e03c584b80 mark dynamic Credential Type labels and help_text for i18n 
see: https://github.com/ansible/tower/issues/1960
related: https://github.com/ansible/ansible-tower/pull/6844
 2018-05-25 15:08:11 -04:00
Ryan Petrello a0433773d8 don't allow Accept:application/json on /api/login/ 
see: https://github.com/ansible/tower/issues/1672
 2018-05-25 14:21:22 -04:00
Marliana Lara b5cb4e8290 Merge pull request #1958 from marshmalien/fix/1949-proj-permissions-users-link 
Fix project permissions user link
 2018-05-25 14:10:46 -04:00
Marliana Lara 0b0fd21734 Fix project permissions user link 2018-05-25 13:57:10 -04:00
kialam 8acb57f43a Merge pull request #1954 from kialam/fix/1880-tag-component 
Create Tag Component for Job Search
 2018-05-25 13:45:09 -04:00
kialam 376a763cc0 vertically center CLEAR ALL "button" using newly created mixin and resolve merge conflict 2018-05-25 13:32:43 -04:00
kialam a9bdac0d53 use newer variables 2018-05-25 12:26:44 -04:00
kialam d8dcac9158 small cleanup 2018-05-25 12:26:44 -04:00
kialam edada76050 Pixel pushing 2018-05-25 12:26:44 -04:00
kialam d83fa5a031 change 5px down to 3px per design feedback. 2018-05-25 12:26:44 -04:00
kialam 7292e00158 create componentized tags 2018-05-25 12:26:44 -04:00
Alan Rominger 03d975e18d Merge pull request #1959 from AlanCoding/cpf8 
flake8 errors in access.py due to an upgrade
 2018-05-25 12:09:37 -04:00
Jake McDermott 54056963af Merge pull request #1951 from jakemcdermott/job-results/strings 
organize and translate job output and workflow results strings
 2018-05-25 11:34:18 -04:00
AlanCoding e64e25fcc1 flake8 errors in access.py due to an upgrade 2018-05-25 11:28:38 -04:00
Jake McDermott 29f0f94734 Merge pull request #1955 from jakemcdermott/job-results/always-discard-lines-beneath-threshold 
always discard lines beneath threshold when tailing output
 2018-05-25 11:22:08 -04:00
Christian Adams b065593e49 Merge pull request #1932 from rooftopcellist/validate_scope 
Validate scope
 2018-05-25 10:49:02 -04:00
Alan Rominger d35fb691b1 Merge pull request #1952 from AlanCoding/new_test_artifact 
Ignore new test artifact being produced
 2018-05-25 09:54:05 -04:00
John Mitchell 733c3fe594 Merge pull request #1940 from jlmitch5/fixAuditor 
Fix auditor issues of displaying stuff you shouldn't in the ui
 2018-05-25 09:34:42 -04:00
Ryan Petrello 960b64f292 Merge pull request #1947 from ryanpetrello/fix-897 
fix a bug in the instance policy algorithm when both min and % are used
 2018-05-25 08:55:51 -04:00
Jared Tabor 3d8d27064f Makes rows inactive on permissions list if assigning user doesn't have 
permission to edit the target user
 2018-05-25 00:18:50 -07:00
Jake McDermott 46758f1e7e always discard events beneath line threshold 2018-05-24 22:48:09 -04:00
Jake McDermott e085c4ae71 use a one-way binding for back-to-top text 2018-05-24 20:10:00 -04:00
Marliana Lara cdbcf4c128 Merge pull request #1897 from marshmalien/fix/1865-templates-list-active-row 
Update active row indicator when state param id changes
 2018-05-24 16:32:56 -04:00
Michael Abashian 6f868a7bca Merge pull request #1925 from mabashian/1902-root-edge-type 
Fixed error changing edge type of a previous root node
 2018-05-24 16:28:31 -04:00
Michael Abashian f187210405 Merge pull request #1941 from mabashian/1933-edge-toggle 
Fixed edge type dropdown race condition
 2018-05-24 16:24:15 -04:00
Jake McDermott dcd36adf25 add one-way bindings for static stats bar strings 2018-05-24 15:59:58 -04:00
Jake McDermott 62fa6dadb0 organize and translate workflow results strings 2018-05-24 15:57:50 -04:00
Jake McDermott 930ecaec3e organize and translate job output strings 2018-05-24 15:57:31 -04:00
AlanCoding 1790b1703f ignore new test artifact being produced 2018-05-24 15:48:13 -04:00
adamscmRH bb6a4f6964 fix oauth urls & rename for clarity 2018-05-24 15:32:48 -04:00