Commit Graph

15749 Commits

Author SHA1 Message Date
Shane McDonald 3cd80ef67a Update pot files 2017-11-30 15:29:29 -05:00
Wayne Witzel III f3310236e4 Merge pull request #599 from wwitzel3/release_3.2.2
Fix git project sync bug.
2017-11-30 11:22:29 -05:00
Wayne Witzel III ed28faa3db Use TMP instead of TMPDIR and only set it in RunProjectUpdate 2017-11-30 16:10:12 +00:00
Alan Rominger fde5a8850d Merge pull request #748 from AlanCoding/no_job_in_relaunch
Do not show job serialization in relaunch GET
2017-11-30 09:58:35 -05:00
AlanCoding c359c072c4 do not show job serialization in relaunch GET 2017-11-30 08:47:35 -05:00
Jake McDermott ee0aa40542 Merge pull request #743 from jakemcdermott/gcp-service-file
fix submit when no input object defined
2017-11-29 20:50:24 -05:00
Jake McDermott 81f2184aa7 fix submit when no input object defined 2017-11-29 19:50:46 -05:00
Jake McDermott 96c66b1e20 Merge pull request #712 from jakemcdermott/gcp-service-file
add input field for gcp service account json file
2017-11-29 18:41:23 -05:00
Jake McDermott dbb9ffbaf4 use settings when setting up user data 2017-11-29 18:27:46 -05:00
Jake McDermott 06a7c024fe add e2e test for gcp service account file input 2017-11-29 18:27:34 -05:00
Jake McDermott 1229a10f35 add gcp service account file input 2017-11-29 18:27:24 -05:00
Jake McDermott f15b1ae549 disable textarea drag and drop when field is disabled 2017-11-29 18:27:12 -05:00
Jake McDermott 71fea2e360 allow for programmatic input to text and textarea-secret fields 2017-11-29 18:26:59 -05:00
Jake McDermott 5baa371739 add unit test for file input component 2017-11-29 18:26:47 -05:00
Jake McDermott cc8b5bc808 add file input component 2017-11-29 18:26:36 -05:00
Alan Rominger 53c6248a6d Merge pull request #647 from AlanCoding/no_sql
remove raw SQL in visible_roles
2017-11-29 16:46:09 -05:00
Ryan Petrello fc4b02b79f Merge pull request #597 from ryanpetrello/jenkins-no-like-unicode
removing some cruft we thought would help us catch bugs (it didn't)
2017-11-29 16:39:20 -05:00
Ryan Petrello a3dd9eb4b7 removing some cruft we thought would help us catch bugs (it didn't) 2017-11-29 16:23:07 -05:00
AlanCoding c4bc310271 remove raw SQL in visible_roles 2017-11-29 16:04:31 -05:00
Ryan Petrello d773d163f7 Merge pull request #595 from ryanpetrello/fix-workflow-survey-encrypt
more survey password encryption bug squashing
2017-11-29 15:09:40 -05:00
Chris Meyers 1899795d08 Merge pull request #721 from chrismeyersfsu/feature-2_factor
allow support for saml + 2-factor
2017-11-29 14:54:57 -05:00
Alan Rominger 43c58b5bf5 Merge pull request #731 from AlanCoding/enabled_fix
fix inventory import bug with enabled_var
2017-11-29 14:46:16 -05:00
Ryan Petrello 68ada92f3b more survey password encryption bug squashing
the nature of this latest bug is that the WorkflowJob has a *different*
implementation of _accept_or_ignore_job_kwargs, and it wasn't performing
encryption for extra vars provided at launch time; this change places the
encryption mechanism in UJT.create_unified_job so that it works the same
for _all_ UJTs

see: https://github.com/ansible/ansible-tower/issues/7798
see: https://github.com/ansible/ansible-tower/issues/7046
2017-11-29 14:40:41 -05:00
AlanCoding 2c06bfc9ce fix inventory import bug with enabled_var 2017-11-29 14:12:03 -05:00
Aaron Tan 4c43afda19 Merge pull request #586 from jangsutsr/fix-7768
Supress exception with concurrent deletion
2017-11-29 13:40:45 -05:00
Alan Rominger 5602b5d2d7 Merge pull request #733 from AlanCoding/credentials_in_list
Show credentials in list view
2017-11-29 12:09:52 -05:00
Chris Meyers 032318494b added tests for new settings field type 2017-11-29 11:52:00 -05:00
Bill Nottingham 40c22dcec8 Merge pull request #643 from wenottingham/whitespace-the-final-frontier
Fix extra whitespace in callback URL.
2017-11-29 11:29:45 -05:00
Alan Rominger 04f682bf7a Merge pull request #694 from AlanCoding/credentials_not_a_thing
adjust assertions about JT credentials to be correct
2017-11-29 10:41:48 -05:00
Alan Rominger 070a12a10c Merge pull request #692 from AlanCoding/vault_credential_check
Modify JT access tests to reflect new vault_credential reality
2017-11-29 10:40:35 -05:00
Ryan Petrello 91cc4689c9 Merge pull request #594 from ryanpetrello/fix-sosreport-venv
fix incorrect virtualenv path for sosreport plugin
2017-11-29 10:07:12 -05:00
Hideki Saito febfcf709d fix incorrect virtualenv path for sosreport plugin 2017-11-29 09:57:41 -05:00
Wayne Witzel III 53460db4d7 Merge pull request #736 from ewjoachim/fix-social-core
Fix import of social_core.exceptions in sso/pipeline.py
2017-11-29 09:26:43 -05:00
AlanCoding 37a44c439e show credentials in list view 2017-11-29 08:14:45 -05:00
Joachim Jablon 6609f38fa2 Fix import of social_core.exceptions in sso/pipeline.py
Signed-off-by: Joachim Jablon <ewjoachim@gmail.com>
2017-11-29 14:08:58 +01:00
Alan Rominger 8f5be46d52 Merge pull request #730 from AlanCoding/list_bug
fix bug with inventory update queryset
2017-11-28 18:41:39 -05:00
Ryan Petrello cf1d5a29f6 Merge pull request #593 from ryanpetrello/fix-7796
fix another encrypted survey password bug
2017-11-28 17:08:35 -05:00
Ryan Petrello 1425021106 fix another encrypted survey password bug
properly encrypt extra_vars that overlap with survey passwords when
`ask_variables_on_launch=true`

see: https://github.com/ansible/ansible-tower/issues/7796
2017-11-28 16:52:47 -05:00
Bill Nottingham 3866dcaaae Merge pull request #732 from wenottingham/quote-fu
Remove stray quote from help string.
2017-11-28 15:38:42 -05:00
Ryan Petrello 7b42316366 Merge pull request #592 from ryanpetrello/fix-7793
fix a bug which caused v1 cred backwards-compat to apply to v2 requests
2017-11-28 14:49:54 -05:00
Bill Nottingham 8cede51bac Remove stray quote from help string. 2017-11-28 14:32:39 -05:00
AlanCoding a880f47925 fix bug with inventory update queryset 2017-11-28 14:13:35 -05:00
Chris Meyers 383c3cfe3e add more saml fields 2017-11-28 13:49:35 -05:00
Shane McDonald 32fcb84cf6 Merge pull request #722 from jakemcdermott/tools-awx-pycrypto
add pycrypto distro package to tools awx container image
2017-11-28 13:42:02 -05:00
Ryan Petrello ce9d75c2e4 Merge pull request #591 from ryanpetrello/rename-ovirt
rename oVirt4 to Red Hat Virtualization
2017-11-28 13:10:58 -05:00
Ryan Petrello 26845642f0 fix a bug which caused v1 cred backwards-compat to apply to v2 requests
see: https://github.com/ansible/ansible-tower/issues/7793
2017-11-28 13:05:13 -05:00
Jake McDermott 34195a1b35 add pycrypto distro package to tools awx container image 2017-11-28 12:45:53 -05:00
Ryan Petrello 6fa0d9d4ed rename oVirt4 to Red Hat Virtualization
see: https://github.com/ansible/ansible-tower/issues/7790
2017-11-28 11:02:42 -05:00
Greg Considine c723ba5289 Merge pull request #717 from gconsidine/ui/bump-dependency-versions
Update dependency versions to pull in latest 1.x Angular version
2017-11-28 10:11:12 -05:00
gconsidine 3ff9fa9931 Remove test on async fn with no callback and no returned promise 2017-11-28 09:54:54 -05:00