11108 Commits

Author SHA1 Message Date
Bill Nottingham
d025ac9027 Merge pull request #4890 from wenottingham/rolefu
Nuke galaxy metadata from some Tower setup roles.
2017-01-25 14:18:34 -05:00
Bill Nottingham
87c3183a31 Merge pull request #4922 from wenottingham/thats-no-moon
Merge foreman inventory script performance fixes.
2017-01-25 14:18:26 -05:00
Ryan Petrello
188e423bd7 Merge pull request #4943 from ryanpetrello/fix-4861
fix a typo that results in a NameError
2017-01-25 14:17:41 -05:00
Ryan Petrello
f347bc5ae4 fix a typo that results in a NameError
Resolves #4861
2017-01-25 14:08:49 -05:00
Ryan Petrello
a13b2588b2 Merge pull request #4938 from ryanpetrello/release_3.1.0
fix a bug which causes activitystream actor assignment to be invalid
2017-01-25 13:54:38 -05:00
Alan Rominger
4feb7fcb8d Merge pull request #4862 from AlanCoding/poly_morphin_time
Unified JT and Unified Job queryset refactor
2017-01-25 13:05:48 -05:00
Alan Rominger
f90447ea95 Merge pull request #4936 from AlanCoding/wf_launch_update
Update WFJT launch help text
2017-01-25 13:02:34 -05:00
Alan Rominger
fe36e2ad8e Merge pull request #4921 from AlanCoding/jobs_others_opt
Low hanging query optimizations
2017-01-25 11:57:08 -05:00
Alan Rominger
460dfe7548 Merge pull request #4916 from AlanCoding/no_missing_dict
Remove missing resource checks from nodes
2017-01-25 11:53:22 -05:00
Ryan Petrello
e7c5dfeaa4 fix a bug which causes activitystream actor assignment to be invalid
Resolves #4660
2017-01-25 11:45:12 -05:00
Michael Abashian
7c4b77284e Merge pull request #4934 from mabashian/4906-workflow-launch
Fix workflow details view
2017-01-25 10:56:23 -05:00
AlanCoding
62d2a30d70 updated WFJT launch help text 2017-01-25 10:49:31 -05:00
Michael Abashian
a380830861 Building workflow node tree now returns a promise. Code needed to be updated accordingly 2017-01-25 10:46:28 -05:00
Alan Rominger
8b31251b64 Merge pull request #4928 from AlanCoding/wf_todo
Remove workflow TODOs
2017-01-25 10:18:49 -05:00
Alan Rominger
8cbb841989 Merge pull request #4930 from AlanCoding/launch_type_migration
include added launch_type choice in 3.1 migration
2017-01-25 10:13:13 -05:00
Chris Meyers
dff41bf035 Merge pull request #4919 from chrismeyersfsu/fix-4698
more correctly handle notification email list
2017-01-25 09:57:00 -05:00
AlanCoding
bae3fdb635 removal of workflow TODOs that are resolved 2017-01-25 09:52:05 -05:00
AlanCoding
c22cf2f7e6 more presets and timing functionality to data generator 2017-01-25 09:51:25 -05:00
AlanCoding
f265d2fe0f tighten up code for new UJ queryset 2017-01-25 09:51:24 -05:00
AlanCoding
36c68178dd cleanup from accessible_objects refactor 2017-01-25 09:51:24 -05:00
AlanCoding
b2d0871a5e Refactor of accessible_objects for polymorphic model
query simplification, with break-out into an intermediary
state that can be used in access methods
2017-01-25 09:51:24 -05:00
AlanCoding
710702dffe include added launch_type choice in 3.1 migration 2017-01-25 09:49:29 -05:00
Alan Rominger
8650b69c9e Merge pull request #4929 from AlanCoding/f8_cache
flake8
2017-01-25 09:43:33 -05:00
AlanCoding
35c824b25e remove cache import for flake8 purposes 2017-01-25 09:34:29 -05:00
Matthew Jones
4771b2efc0 Merge branch 'remove_jobevent_parent_usage' into release_3.1.0
* remove_jobevent_parent_usage:
  Don't iterate over parents, perform a final update at the end
  Drop assignment of job event parent in favor of parent_uuid
2017-01-24 21:07:58 -05:00
Alan Rominger
07fe3be4b2 Merge pull request #4674 from AlanCoding/workflow_handholding
Add help text templates for remaining workflow endpoints
2017-01-24 17:05:56 -05:00
Bill Nottingham
e12ae193db Merge foreman inventory script performance fixes.
Sent & accepted upstream.
2017-01-24 16:40:59 -05:00
AlanCoding
d3b5eaf690 query improvement for jobs, users, and orgs 2017-01-24 16:23:10 -05:00
Matthew Jones
22a3e87720 Don't iterate over parents, perform a final update at the end 2017-01-24 16:21:50 -05:00
Chris Meyers
8198abe3fa join array of emails using '\n' when displaying
* Don't ASSume user email addresses don't contain ,
* Allows email addresses to contain ,
2017-01-24 15:58:59 -05:00
Chris Meyers
2828352d3e Merge pull request #4863 from chrismeyersfsu/fix-4787
hide add permissions when editing super user
2017-01-24 15:52:41 -05:00
Jared Tabor
78e22bd884 Merge pull request #4913 from jaredevantabor/ctit
adding Settings to CTiT breadcrumb bar
2017-01-24 12:48:30 -08:00
Matthew Jones
2af98e5f58 Drop assignment of job event parent in favor of parent_uuid
* This eliminates the save lookup of the parent job event and
  associated memcached call(s)
* Removes some other legacy parent determination mechanisms
* Alternate way to query for the parent/child relationship
2017-01-24 15:40:33 -05:00
Chris Meyers
cf52b82fa6 hide smart search also 2017-01-24 15:33:18 -05:00
Bill Nottingham
7a39b97b68 Merge pull request #4893 from wenottingham/venv
Clear Tower venv in virtualenv creation in packaging
2017-01-24 14:27:37 -05:00
AlanCoding
be1b2b418c Remove missing resource checks from nodes 2017-01-24 13:52:06 -05:00
Jared Tabor
baef3797f3 Merge pull request #4914 from jaredevantabor/smart-search-key-exit-holder
removing the exit icon from the smart search key pane
2017-01-24 10:15:32 -08:00
jaredevantabor
32c11bb675 removing the exit icon from the smart search key pane 2017-01-24 10:04:53 -08:00
jaredevantabor
cdbf0cb44b adding Settings to CTiT breadcrumb bar 2017-01-24 09:54:25 -08:00
Jared Tabor
143e416f6f Merge pull request #4897 from jaredevantabor/ctit
CTiT: AD_HOC_COMMANDS select2
2017-01-24 09:00:07 -08:00
Chris Meyers
a804c8ad96 Merge pull request #4887 from chrismeyersfsu/fix-4785
conditional stdout resize tooltip text
2017-01-24 11:24:38 -05:00
Graham Mainwaring
7d209d2dda Merge pull request #4894 from ghjm/deb_no_apache
Remove unnecessary mucking about with Apache config
2017-01-24 11:23:01 -05:00
Bill Nottingham
7785bdf5e2 Merge pull request #4907 from wenottingham/ssl-python-aaargh
Ensure we have a non-SSL INTERNAL_API_URL.
2017-01-24 11:19:25 -05:00
Matthew Jones
986ddae33e Merge pull request #4882 from matburt/cache_behavior_fixes
Fixes for data corruption/exception in cache usage
2017-01-24 11:12:28 -05:00
Ryan Petrello
b917ffbc63 Merge pull request #4901 from ryanpetrello/release_3.1.0
allow certain LDAP settings fields to be nullable
2017-01-24 11:01:31 -05:00
Chris Meyers
e06f2661f8 conditional stdout resize tooltip text
related to #4785
2017-01-24 10:12:29 -05:00
jlmitch5
f0e61671a6 Merge pull request #4902 from jlmitch5/changeResultsToDetails
change results label to details based on feedback from tvo and taufique
2017-01-24 09:51:53 -05:00
John Mitchell
c59a64b24f change results label to details based on feedback from tvo and taufique 2017-01-24 09:49:14 -05:00
Michael Abashian
1d4f0a7940 Merge pull request #4886 from mabashian/4860-delete-search-tag
Fixed bug that prevented deletion of stdout search tags
2017-01-24 09:35:23 -05:00
Ryan Petrello
0bcbaa5c86 allow certain LDAP settings fields to be nullable
necessary to completely resolve #4678
2017-01-24 09:31:44 -05:00