External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 08:20:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
21,068 Commits 63 Branches 102 Tags
196b6572b2e85b3cd5296627e1e3ddca9727654a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot] 37cb912367 Merge pull request #4075 from ryanpetrello/old-migration-cleanup 
delete a few really old migration utility files

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-14 14:27:47 +00:00
softwarefactory-project-zuul[bot] 9958f382d7 Merge pull request #4043 from mabashian/4029-inv-refresh 
Fixes bug where the delete inventory event would wipe or reset inventory form fields

Reviewed-by: Michael Abashian
             https://github.com/mabashian
 2019-06-14 14:04:59 +00:00
softwarefactory-project-zuul[bot] 1d767a15d8 Merge pull request #4044 from mabashian/read-only-codemirrors 
Read-only codemirror cleanup

Reviewed-by: Michael Abashian
             https://github.com/mabashian
 2019-06-14 13:58:51 +00:00
softwarefactory-project-zuul[bot] 612373c849 Merge pull request #4041 from mabashian/wf-execute-unsaved 
Fixes bug where save changes modal was shown to user with execute permissions

Reviewed-by: Michael Abashian
             https://github.com/mabashian
 2019-06-14 13:45:33 +00:00
softwarefactory-project-zuul[bot] d4ad674899 Merge pull request #4064 from mabashian/3829-new-list-links 
Fixes links in various lists to maintain query params while navigating to edit form

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-13 21:56:34 +00:00
softwarefactory-project-zuul[bot] 9d3aca5e1b Merge pull request #4060 from mabashian/3830-host-filter-search 
Always show search bar in smart inventory host filter modal

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-13 21:44:02 +00:00
softwarefactory-project-zuul[bot] e1d60ff4f1 Merge pull request #4052 from gamuniz/enabled_value_fix 
Enabled value fix to be case insensitive(GCE API)

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-13 20:08:30 +00:00
softwarefactory-project-zuul[bot] 793e78d9c0 Merge pull request #4046 from AlanCoding/setuptools 
Upgrade pip and setuptools

Reviewed-by: Alan Rominger <arominge@redhat.com>
             https://github.com/AlanCoding
 2019-06-13 14:13:28 +00:00
softwarefactory-project-zuul[bot] 28cc08f215 Merge pull request #4033 from mabashian/bootstrap-whitelist-table 
Whitelist table elements for use in bootstrap popovers

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-12 21:12:37 +00:00
softwarefactory-project-zuul[bot] e70c7ab458 Merge pull request #3967 from jbradberry/upgrade-drf-3.9.4 
Upgrade DRF to 3.9.4

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-12 18:41:05 +00:00
softwarefactory-project-zuul[bot] 4a19da650d Merge pull request #4056 from ansible/capitalization 
updated e2e to work with new capitalization

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-12 17:36:29 +00:00
softwarefactory-project-zuul[bot] 7161f28d26 Merge pull request #4053 from AlanCoding/apps_management 
Correctly manage current apps for the action_node addition

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-12 15:59:55 +00:00
softwarefactory-project-zuul[bot] 290c242221 Merge pull request #4054 from ansible/unpin-vault-plugin-container-image 
unpin vault plugin development container image

Reviewed-by: awxbot
             https://github.com/awxbot
 2019-06-12 15:00:23 +00:00
softwarefactory-project-zuul[bot] c7b38bc9b9 Merge pull request #4050 from Spredzy/capitalize 
User: Ensure First Name is not capitalized

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
 2019-06-12 13:23:21 +00:00
softwarefactory-project-zuul[bot] 42b3aa45c5 Merge pull request #4045 from ansible/quick-chrome75-workaround 
Chrome75 workaround for e2e tests

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-12 11:52:09 +00:00
softwarefactory-project-zuul[bot] b3979eb2b9 Merge pull request #4042 from shanemcd/cache-me-outside 
Always consider devel tag as a cache source

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-11 18:34:25 +00:00
softwarefactory-project-zuul[bot] 31b78cc00f Merge pull request #4036 from AlanCoding/event_query 
Cache smart inventory memberships to avoid slow query

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-11 15:55:55 +00:00
softwarefactory-project-zuul[bot] a510f9f2c7 Merge pull request #4038 from jakemcdermott/update-v1-cred-delete-prompt-queries 
update credential deletion prompt queries

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-11 15:26:49 +00:00
softwarefactory-project-zuul[bot] 3054fbc61c Merge pull request #4040 from ryanpetrello/ldap-py3-bug 
fix a py3 compat problem in an LDAP migration

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-11 14:47:12 +00:00
softwarefactory-project-zuul[bot] adb768bed3 Merge pull request #3413 from ryanpetrello/bye-bye-v1 
remove /api/v1 and deprecated credential fields

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-10 17:31:28 +00:00
softwarefactory-project-zuul[bot] 9253ab28c8 Merge pull request #4021 from ryanpetrello/dotted-vault-id 
support vault IDs that include dot characters

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-06 18:34:24 +00:00
softwarefactory-project-zuul[bot] 31d4e8362e Merge pull request #4003 from keithjgrant/3574-survey-tab-required-fields 
Don't allow Enter to proceed to next step if survey fields invalid

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-06 18:33:29 +00:00
softwarefactory-project-zuul[bot] 176f8632e5 Merge pull request #4017 from ryanpetrello/swagger-action-node 
make activity stream action_node deterministic for Swagger docs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-06 16:13:17 +00:00
softwarefactory-project-zuul[bot] 958c192ff7 Merge pull request #4000 from rooftopcellist/order_job_counts 
fix analytics job counts by ordering query

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-06 15:16:42 +00:00
softwarefactory-project-zuul[bot] 7e8990dff9 Merge pull request #4011 from shanemcd/devel 
Clean up related to isolated env

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-06 14:48:49 +00:00
softwarefactory-project-zuul[bot] 8be0b01c33 Merge pull request #4013 from ansible/docker-container-tag-updates 
Updated docker tags in container setup

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-05 20:17:03 +00:00
softwarefactory-project-zuul[bot] c7f49c1193 Merge pull request #3992 from marshmalien/isolated-badge 
Add isolated badge to isolated instance groups

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-05 16:58:20 +00:00
softwarefactory-project-zuul[bot] 3fcf3b20c4 Merge pull request #4005 from shanemcd/sdist-builder-node 
Update node in AWX installer sdist builder

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-05 11:48:30 +00:00
softwarefactory-project-zuul[bot] 5db3a8e7dc Merge pull request #4007 from git4anand/devel 
Multiple installation of same dependency

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-05 11:39:46 +00:00
softwarefactory-project-zuul[bot] 839f49c6ed Merge pull request #3997 from ryanpetrello/libcloud 
unpin apache-libcloud now that a version is out without PyCrypto

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-04 19:59:06 +00:00
softwarefactory-project-zuul[bot] 67fb898a9d Merge pull request #3993 from shanemcd/fix-isolated-dev-env 
Fix isolated dev env

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-03 21:43:31 +00:00
softwarefactory-project-zuul[bot] 1829017ad4 Merge pull request #3991 from shanemcd/downgrade-ptyprocess 
Downgrade ptyprocess

Reviewed-by: awxbot
             https://github.com/awxbot
 2019-06-03 18:19:15 +00:00
softwarefactory-project-zuul[bot] 112b9e7381 Merge pull request #3984 from jpmens/patch-1 
Emphasize a recent version of Docker

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-03 17:42:24 +00:00
softwarefactory-project-zuul[bot] 87bd3c2f93 Merge pull request #3987 from Spredzy/quote_password 
Installer: quote password where it applies

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-03 17:38:49 +00:00
softwarefactory-project-zuul[bot] 724ca9cd57 Merge pull request #3979 from elyezer/resize-window-e2e 
e2e resize window on some specific tests

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-03 14:21:43 +00:00
softwarefactory-project-zuul[bot] d8a80f9f3e Merge pull request #3981 from jakemcdermott/test-debug-helpers 
add some debug helpers for tests

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-31 16:19:20 +00:00
softwarefactory-project-zuul[bot] f64e31735c Merge pull request #3980 from wenottingham/following-in-finns-footsteps 
Remove some things that are not first-order dependencies from requirements.in

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-31 15:14:43 +00:00
softwarefactory-project-zuul[bot] d7c33a7246 Merge pull request #3893 from AlanCoding/replace_job_origin 
Replace JobOrigin model with ActivityStream.action_node field

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-31 11:59:09 +00:00
softwarefactory-project-zuul[bot] 9b5494a6cc Merge pull request #3976 from Spredzy/fix_quote 
openshift: Ensure char in password are not interpreted

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-31 01:27:38 +00:00
softwarefactory-project-zuul[bot] e6b78292ec Merge pull request #3974 from ryanpetrello/downstream-i18n 
Fix python3 fallout in translations management script

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-30 19:06:26 +00:00
softwarefactory-project-zuul[bot] 0a256a98be Merge pull request #3965 from AlexSCorey/2866-JTForksToolTip 
Updates text of tooltip for Forks in JT.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-30 17:09:49 +00:00
softwarefactory-project-zuul[bot] 5756151568 Merge pull request #3921 from joseorpa/devel3004proxy 
#3004 Add proxy support to postgresql, memcached and rabbitmq images

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-30 14:33:17 +00:00
softwarefactory-project-zuul[bot] 6606fd7461 Merge pull request #3930 from kialam/upgrade-node-v8-to-node-v10 
Upgrade our UI packaging for NodeJS 10.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-30 14:29:52 +00:00
softwarefactory-project-zuul[bot] 4b1fc7894d Merge pull request #3961 from rooftopcellist/rm_implicit 
remove implicit grant type for OAuth 2 apps

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-29 20:27:11 +00:00
softwarefactory-project-zuul[bot] 41f2b83ae2 Merge pull request #3947 from ryanpetrello/transient-queues 
RFC: add the ability to disable RabbitMQ queue durability

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-28 20:15:26 +00:00
softwarefactory-project-zuul[bot] 8c56d1d3a7 Merge pull request #3932 from shanemcd/zuul_k8s 
Changes to enable tests in k8s

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-28 19:34:58 +00:00
softwarefactory-project-zuul[bot] 5a502f8709 Merge pull request #3925 from AlanCoding/gce_contract 
Restore old use pattern for gce_ modules, update token_uri URL

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-28 17:03:32 +00:00
softwarefactory-project-zuul[bot] 873ff3de78 Merge pull request #3928 from wenottingham/waka-flocka 
Use lockf, not flock.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-28 16:29:23 +00:00
softwarefactory-project-zuul[bot] eb3ef809e0 Merge pull request #3873 from shanemcd/faster-boots 
Avoid DNS timeout in non-Docker for Mac installs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-28 14:30:45 +00:00
softwarefactory-project-zuul[bot] 9c90694f12 Merge pull request #3604 from athenahealth/complete-ssl-support 
Update SSL support for docker-compose install

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-28 13:51:43 +00:00
softwarefactory-project-zuul[bot] ca3735ee73 Merge pull request #3941 from elyezer/window-size-e2e 
Set window size globally on e2e

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-24 20:23:45 +00:00
softwarefactory-project-zuul[bot] 380f122456 Merge pull request #3804 from AlanCoding/more_optimizations 
Apply optimizations via standard methods

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-24 19:38:46 +00:00
softwarefactory-project-zuul[bot] 1ce587025e Merge pull request #3948 from rooftopcellist/fix_analytics_log_msg 
fix analytics logging msg

Reviewed-by: awxbot
             https://github.com/awxbot
 2019-05-23 18:55:55 +00:00
softwarefactory-project-zuul[bot] 874465a2d4 Merge pull request #3865 from chrismeyersfsu/fix-enabled_still_online 
disabled instance does not mean offline instance

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-23 16:55:09 +00:00
softwarefactory-project-zuul[bot] 34c3aaee3d Merge pull request #3682 from AlanCoding/depgrades 
General upgrade of dependencies

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-23 15:15:20 +00:00
softwarefactory-project-zuul[bot] 13ff5ffdf2 Merge pull request #3900 from AlanCoding/fewer_type_methods 
Remove duplicated type methods and old Django logic

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-23 12:50:35 +00:00
softwarefactory-project-zuul[bot] a606fdc958 Merge pull request #3933 from AlanCoding/schedule_no_op 
More precise handling of schedule computed fields no-ops

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-23 12:39:58 +00:00
softwarefactory-project-zuul[bot] 9a1b205e06 Merge pull request #3944 from AlanCoding/move_to_filter 
Move dynamic log level logic to filter

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-22 23:45:36 +00:00
softwarefactory-project-zuul[bot] 98c923a715 Merge pull request #3856 from rooftopcellist/cleanup_sessions_refactor 
Cleanup Sessions & Tokens System Jobs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-22 20:50:48 +00:00
softwarefactory-project-zuul[bot] 1d328134fd Merge pull request #3931 from wenottingham/be-bold 
Update notification radio button styling to match schedule radiobuttons.

Reviewed-by: Bill Nottingham
             https://github.com/wenottingham
 2019-05-22 18:58:43 +00:00
softwarefactory-project-zuul[bot] 4a711ec2dc Merge pull request #3914 from itdependsnetworks/var_port_numbers 
Update the ports for memcache and rabbitmq to be variablized

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-22 14:08:41 +00:00
softwarefactory-project-zuul[bot] 75fe801efb Merge pull request #3913 from marshmalien/3886-instance-group-breadcrumb-label 
Dynamically show instance group name in breadcrumb

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-21 14:28:55 +00:00
softwarefactory-project-zuul[bot] dc1bf3ef07 Merge pull request #3910 from AlanCoding/no_user_get 
Avoid unnecessary user get expiring session memberships

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-20 17:20:36 +00:00
softwarefactory-project-zuul[bot] 9d4cfa7400 Merge pull request #3890 from AlanCoding/fix_debug_toolbar 
Fix Django debug toolbar after its upgrade

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-20 16:41:13 +00:00
softwarefactory-project-zuul[bot] 2addf20907 Merge pull request #3918 from jbradberry/middleware-ordering 
Fix the middleware ordering

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-20 15:43:06 +00:00
softwarefactory-project-zuul[bot] 29bbecb6bf Merge pull request #3820 from AlanCoding/default_ordering 
Resolve default ordering warnings from tests

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-20 15:31:36 +00:00
softwarefactory-project-zuul[bot] f174902bb2 Merge pull request #3874 from jbradberry/expose-role-type 
Expose the content type associated with roles for ActivityStream objects in the API

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-17 18:06:38 +00:00
softwarefactory-project-zuul[bot] ab1e45d6c4 Merge pull request #3875 from rooftopcellist/swifty_operation 
reorder migrations to avoid session error

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-17 15:41:26 +00:00
softwarefactory-project-zuul[bot] bd50e5d6a8 Merge pull request #3896 from rooftopcellist/collection_no_reset 
collect events based on last ship, not collection

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-17 15:32:48 +00:00
softwarefactory-project-zuul[bot] d353daebc5 Merge pull request #3911 from rooftopcellist/rm_extra_error 
rm extra collection error line

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 20:11:41 +00:00
softwarefactory-project-zuul[bot] 6681cd918c Merge pull request #3906 from heavenly999/devel 
Increasing requests-credssp ver to 1.0.2

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 20:00:07 +00:00
softwarefactory-project-zuul[bot] e0062484d0 Merge pull request #3908 from rverchere/fr_fix 
Correct fr translation for Cancel message

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 18:46:19 +00:00
softwarefactory-project-zuul[bot] faa353521a Merge pull request #3909 from marshmalien/3884-dropdown-alignment 
Fix styling bug in Sort Dropdown

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 18:03:07 +00:00
softwarefactory-project-zuul[bot] ff7e244a84 Merge pull request #3905 from NickBusey/patch-1 
Update INSTALL.md

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 17:02:07 +00:00
softwarefactory-project-zuul[bot] d9965cfe7e Merge pull request #3882 from ryanpetrello/debug-log 
add the ability to toggle DEBUG logging on dynamically

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
 2019-05-16 15:12:01 +00:00
softwarefactory-project-zuul[bot] 8981c7d59a Merge pull request #3904 from wenottingham/new-year-new-you 
Bump date.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 03:35:31 +00:00
softwarefactory-project-zuul[bot] efddd9f679 Merge pull request #3854 from beeankha/add_debug_toolbar 
Update Custom Middleware to New Style

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-15 18:38:24 +00:00
softwarefactory-project-zuul[bot] 6bc1856658 Merge pull request #3861 from beeankha/awx_doc_edits 
Update/Edit AWX Docs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-13 20:41:14 +00:00
softwarefactory-project-zuul[bot] 0d3f1f4ac2 Merge pull request #3871 from ryanpetrello/devel 
merge in downstream changes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-10 16:21:39 +00:00
softwarefactory-project-zuul[bot] 18c69fa391 Merge pull request #3870 from shanemcd/gimme-root 
Ensure that a root user is always present in development environment

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-10 14:57:58 +00:00
softwarefactory-project-zuul[bot] 6d6eae571e Merge pull request #3868 from jakemcdermott/ig-order-docstring 
add docstring and test for instance group service

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-10 14:54:52 +00:00
softwarefactory-project-zuul[bot] 9d1ed837f9 Merge pull request #3869 from AlanCoding/dev_supervisor_fix 
Fix bug in dev supervisor reparenting processes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-10 13:45:30 +00:00
softwarefactory-project-zuul[bot] 8725d3e539 Merge pull request #3842 from ryanpetrello/instance-group-order 
enforce a stable list order when attaching/detaching instance groups

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 21:04:29 +00:00
softwarefactory-project-zuul[bot] e7290e6452 Merge pull request #3864 from rooftopcellist/more_verbose_instance_msg 
more verbose list_instance messaging

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 19:31:24 +00:00
softwarefactory-project-zuul[bot] 99dc84c275 Merge pull request #3863 from ryanpetrello/makefile-supervisor 
use make targets for dev supervisor commands

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 18:07:39 +00:00
softwarefactory-project-zuul[bot] 6feb58f76d Merge pull request #3853 from AlanCoding/variable_data_permission 
Put variable data permission in its own class

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 16:48:11 +00:00
softwarefactory-project-zuul[bot] 2910a9dfff Merge pull request #3858 from shanemcd/unsquash 
Remove --squash option from awx-devel-build

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 14:19:59 +00:00
softwarefactory-project-zuul[bot] 91968a09c8 Merge pull request #3849 from AlanCoding/password_madness 
Reduce passing around of passwords dictionary

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 13:34:43 +00:00
softwarefactory-project-zuul[bot] 190098bbd5 Merge pull request #3848 from AlanCoding/standard_injector 
Move outlier gce cache logic to standard place

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 12:56:11 +00:00
softwarefactory-project-zuul[bot] 83c286580b Merge pull request #3852 from shanemcd/dockerfiled 
Refactor Dockerfiles

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 01:08:49 +00:00
softwarefactory-project-zuul[bot] 186ec88581 Merge pull request #3839 from zicklam/webhook_disable_ssl_verify 
Add "Disable SSL Verification" checkbox to webhook notification

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 19:44:11 +00:00
softwarefactory-project-zuul[bot] 6407ab58ff Merge pull request #3855 from ryanpetrello/improved-dev-code-reload 
remove honcho in the dev environment (just use foregrounded supervisor)

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 19:25:57 +00:00
softwarefactory-project-zuul[bot] 70972f7ea1 Merge pull request #3850 from jbradberry/reload-dispatcher-on-code-change 
Make the uwsgi autoreloader reload the dispatcher every time

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 16:11:04 +00:00
softwarefactory-project-zuul[bot] e05c6e67b6 Merge pull request #3837 from saito-hideki/issue/2891 
Add credential info in expanded list view of inventory update

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 13:37:34 +00:00
softwarefactory-project-zuul[bot] c7fe840868 Merge pull request #3810 from vismay-golwala/restrict_copy_jt 
Raise meaningful error when permission denied to copy JT

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-07 13:52:04 +00:00
softwarefactory-project-zuul[bot] 6908558acd Merge pull request #3833 from ryanpetrello/iso-mem-cpu 
properly record Instance.cpu and Instance.memory for isolated nodes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-06 16:14:18 +00:00
softwarefactory-project-zuul[bot] 4dc7178f3c Merge pull request #3785 from AlanCoding/no_output_replacements 
Remove unused output_replacements logic

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-06 16:11:51 +00:00
softwarefactory-project-zuul[bot] cf6a103207 Merge pull request #3818 from ryanpetrello/devel 
merge in downstream changes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-03 14:36:56 +00:00
softwarefactory-project-zuul[bot] e5cf5be18d Merge pull request #3815 from pmoravec/awx-pmoravec-tower-sos-plugin-improvements 
sosreport plugin improvements

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-03 12:47:39 +00:00
softwarefactory-project-zuul[bot] f26ae8ef13 Merge pull request #3714 from vismay-golwala/org_member_count 
Show only member users for organization

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-03 12:36:29 +00:00