Commit Graph

14053 Commits

Author SHA1 Message Date
Bill Nottingham bd55669423 Merge pull request #7250 from wenottingham/po-tay-to-po-tah-to
Fix header logo usage in API template.
2017-07-21 14:46:13 -04:00
Ryan Petrello 83ac761d81 fix a unit test that periodically fails
if you run this test *a lot*, it fails - seemingly due to a bug in
pexpect itself and how it handles stdout buffering; introducing a bit
of latency seems to make the issue go away

see: #7171
2017-07-21 14:39:55 -04:00
Jared Tabor c74b0df447 fix for api logo name 2017-07-21 11:37:35 -07:00
Bill Nottingham ae85ce6320 Fix logo usage in API header page 2017-07-21 14:27:14 -04:00
AlanCoding 4bb9bd5a2b correct search terms for reverse FK fields 2017-07-21 14:16:14 -04:00
Alan Rominger 52f8579c04 Merge pull request #7136 from AlanCoding/id_metadata
provide id field in OPTIONS for attaching sublists
2017-07-21 14:11:54 -04:00
jlmitch5 4ead799fd0 Merge pull request #7205 from jlmitch5/credentialTypesLookup
Update credential types to lookup values instead of hardcode
2017-07-21 14:01:42 -04:00
AlanCoding dfa892aae1 provide id field in attaching sublists 2017-07-21 13:50:27 -04:00
Wayne Witzel III 822aa65207 Squash migrations 3.1 / 3.2 2017-07-21 13:24:14 -04:00
Christian Adams 86210b611c Merge pull request #7222 from rooftopcellist/inventory_update_not_manual
Inventory Update All no longer includes manual sources
2017-07-21 13:04:14 -04:00
Ryan Petrello 340ced02e2 Merge pull request #7240 from ryanpetrello/fix-7216
improve sanitation of empty credential values to match API v1 behavior
2017-07-21 12:45:16 -04:00
adamscmRH 98c8499f2f improved query efficiently, refactored code 2017-07-21 12:22:24 -04:00
Christian Adams e955f9d32b Merge pull request #7241 from rooftopcellist/inventory_refresh_update
Updates docs to include Inventory Refresh All info.
2017-07-21 12:10:54 -04:00
Bill Nottingham 67a7df0658 Merge pull request #7236 from wenottingham/florence-and-the-machine-credentials
Keep the 'machine' credential name for user/password & key credentials.
2017-07-21 12:02:54 -04:00
adamscmRH a3d1877e6e includes inventory refresh all in docs 2017-07-21 11:57:45 -04:00
Michael Abashian 6399ea4215 Merge pull request #7239 from mabashian/portal-mode-jobs
Split portal mode jobs into two separate states
2017-07-21 11:54:00 -04:00
Bill Nottingham 836dc7d7f5 Fixup unit tests 2017-07-21 11:45:02 -04:00
Michael Abashian 3fd9e2383f Fixed portal job templates link 2017-07-21 11:38:48 -04:00
Ryan Petrello a640d6afec improve sanitation of empty credential values to match API v1 behavior
This is mostly backwards compatability to avoid surprises: in 3.1.x
if you submit a field value with `null` or an empty string to
a CharField, it's treated as an empty string (and SSH key validation
is skipped).  For boolean field values (`net.authorize`), `null` and
empty string are coerced to `False`.

see: #7216
see: #7218
2017-07-21 11:25:56 -04:00
Michael Abashian fc0a76cd25 Split portal mode jobs into two separate states 2017-07-21 11:10:08 -04:00
Michael Abashian 825dfc9df9 Merge pull request #7179 from mabashian/6442-scroll-top
Scroll the user to the top of the page after a non-search state transition
2017-07-21 11:04:16 -04:00
Michael Abashian 2460ade49d Merge pull request #7190 from mabashian/7163-manual-sources-list
Hide manual inventory sources from the source list
2017-07-21 11:03:47 -04:00
Michael Abashian 5b6ee9fe7d Merge pull request #7199 from mabashian/3402-license-permission
Disable license buttons for non-superuser users
2017-07-21 11:03:05 -04:00
Alan Rominger b8fafa7160 Merge pull request #7232 from AlanCoding/on_update_words
Clarify UI help text for update_on_project_update
2017-07-21 10:56:42 -04:00
Chris Meyers c73cc84e59 Merge pull request #7170 from chrismeyersfsu/fix-4779
validate schedule extra_data
2017-07-21 10:53:53 -04:00
Chris Meyers b80283a1bb Merge pull request #7167 from chrismeyersfsu/fix-6198
remove job_type scan from options
2017-07-21 10:52:36 -04:00
Aaron Tan 65101736a3 Merge pull request #7017 from jangsutsr/6988_remove_run_type_project_update_task_impact
Remove run type project update task_impact
2017-07-21 10:51:25 -04:00
Alan Rominger 1581fd7c50 Merge pull request #7226 from AlanCoding/act_strm_cleanup
disable 2 more types of unhelpful act. str. entries
2017-07-21 10:50:30 -04:00
Alan Rominger eff5022635 Merge pull request #7195 from AlanCoding/exceptions_galore
Additional exception handling for SCM inv updates
2017-07-21 10:49:08 -04:00
Chris Meyers 41ae7b5120 validate schedule extra_data
related to #4779

* Ensure days is a non-negative integer
* Ensure that extra_data is a json payload
2017-07-21 10:46:44 -04:00
Chris Meyers 8e9318e9d4 Merge pull request #7162 from chrismeyersfsu/fix-6233
remove duplicate hosts from host_filter
2017-07-21 10:45:44 -04:00
Chris Meyers c11b870084 remove job_type scan from options
* Need to keep the scan job in job_type for migrations so just remove it
from the constructed OPTIONS
2017-07-21 10:45:17 -04:00
AlanCoding 73570ab4dd Clarify UI help text for update_on_project_update 2017-07-21 10:26:25 -04:00
Bill Nottingham 369c0f19ec Keep the 'machine' credential name for user/password & key credentials. 2017-07-21 10:24:34 -04:00
Matthew Jones 6cbafdcadf Merge pull request #6990 from ghjm/ami_publish_fix
Enrypted is now a required field in boto3
2017-07-21 10:10:31 -04:00
Bill Nottingham 326b7ef920 Merge pull request #7112 from wenottingham/scm-labels
Adjust SCM labels based on SCM type.
2017-07-21 10:02:22 -04:00
Michael Abashian e93fd10204 Merge pull request #7208 from mabashian/6587-source-def-verb
Changed source default verbosity from 0 to 1
2017-07-21 09:55:10 -04:00
Marliana Lara 90d546a855 Merge pull request #7198 from marshmalien/fix/alphabetizeSubcategoryListings
Alphabetize subcategory listings in Tower Config
2017-07-21 09:54:22 -04:00
Marliana Lara 80488e8333 Merge pull request #7204 from marshmalien/fix/handleJobQueryResponseError
Handle SyntaxError during job search query
2017-07-21 09:53:13 -04:00
Chris Meyers 02ecfd97e2 Merge pull request #7174 from chrismeyersfsu/fix-7083
disallow insights creds on smart inventory
2017-07-21 09:44:44 -04:00
AlanCoding a2b98f0a40 disable 2 more types of unhelpful act. str. entries
project local_path changed as a secondary save after creation
adding jobs to dependency list (not user facing)
2017-07-21 07:47:30 -04:00
Shane McDonald 55ca8d439b Add i18n flag to gitignore 2017-07-20 19:59:27 -04:00
Jared Tabor 246a6da546 Merge pull request #7223 from jaredevantabor/awx-logos
changing awx-logos out for angry spud
2017-07-20 16:52:29 -07:00
Jared Tabor 1f98dee4d0 changing awx-logos out for angry spud 2017-07-20 15:55:12 -07:00
adamscmRH 3f9f28322c Inventory Update All no longer includes manual sources 2017-07-20 18:10:22 -04:00
Ryan Petrello 021d0e6498 Merge pull request #7168 from ryanpetrello/fix-6199
consolidate tasks.py cleanup for temporary files into a single place
2017-07-20 17:34:27 -04:00
Ryan Petrello 198f2e31a4 consolidate tasks.py cleanup for temporary files into a single place
see: #6199
2017-07-20 15:12:06 -04:00
Ryan Petrello 1848c25370 Merge pull request #7212 from ryanpetrello/fix-ec2-invsource
fix a bug that breaks inventory updates if no credential is supplied
2017-07-20 14:55:33 -04:00
Ryan Petrello 2e659244f7 fix a bug that breaks inventory updates if no credential is supplied
see: #7206
2017-07-20 14:30:41 -04:00
Jared Tabor d4aef59c20 adding pipe delimeter to title 2017-07-20 11:22:33 -07:00