External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 16:30:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
21,138 Commits 63 Branches 102 Tags
e72b2fac6dfcc82fa9a96c67ca3450377eaa3dfe
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot] 4470e9ca26 Merge pull request #4178 from rooftopcellist/collection_datetime_str 
Fix collection datetime for isolated instance info

Reviewed-by: Elijah DeLee <kdelee@redhat.com>
             https://github.com/kdelee
 2019-06-27 20:03:46 +00:00
softwarefactory-project-zuul[bot] cf0fe729f5 Merge pull request #4039 from mabashian/application-lookup-column 
Fix user token application lookup column widths

Reviewed-by: Michael Abashian
             https://github.com/mabashian
 2019-06-27 18:31:48 +00:00
softwarefactory-project-zuul[bot] 5c338e582a Merge pull request #4167 from ryanpetrello/csp 
add a reasonable default Content Security Policy

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-26 20:21:20 +00:00
softwarefactory-project-zuul[bot] 273415b9aa Merge pull request #4077 from j-shade/devel 
fixed row item labels to view horizontally instead of vertically

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-26 12:50:16 +00:00
softwarefactory-project-zuul[bot] 0a7d6e603e Merge pull request #4165 from shanemcd/sane-working-dir 
Use the source tree as the working directory for our dev env

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-26 00:58:37 +00:00
softwarefactory-project-zuul[bot] cbe6c5bd3b Merge pull request #4164 from aubrel/devel 
Change `docker_service` to `docker_compose`.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-25 21:45:49 +00:00
softwarefactory-project-zuul[bot] aab29bef5b Merge pull request #4141 from ryanpetrello/ovirt4-dep-bump 
bump ovirtsdk version to 4.3.0

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-24 21:18:40 +00:00
softwarefactory-project-zuul[bot] 9f42d9426c Merge pull request #4137 from chrismeyersfsu/fix-smart_inv_race 
wrap smart inv cache update w/ advisory lock

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 20:25:10 +00:00
softwarefactory-project-zuul[bot] b369609f07 Merge pull request #4103 from AlexSCorey/79-NotifyOnJobStart 
Adds notify on start toggle

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 16:51:52 +00:00
softwarefactory-project-zuul[bot] c46be3e718 Merge pull request #4083 from rmkraus/devel 
Updated ovirt4 dynamic inventory script.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 16:40:29 +00:00
softwarefactory-project-zuul[bot] 38aedcdd48 Merge pull request #4136 from Spredzy/revert_makefile 
Revert "Makefile: align pip and setuptools bump"

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 13:42:26 +00:00
softwarefactory-project-zuul[bot] 59bec99f4c Merge pull request #4128 from tchellomello/k8s-annotations 
Introduces the ability to pass annotations to the Kubernetes Ingress Controllers

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 13:14:47 +00:00
softwarefactory-project-zuul[bot] e269634afc Merge pull request #4112 from jbradberry/fix-3603 
Use the `in` operator to test against the Organization membership subquery

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-20 12:56:08 +00:00
softwarefactory-project-zuul[bot] 4daf574899 Merge pull request #4114 from shanemcd/revert-pip-and-setuptools 
Revert pip and setuptools

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-20 02:42:04 +00:00
softwarefactory-project-zuul[bot] 067ba7f8fe Merge pull request #4116 from tchellomello/ca_trust_dir_project_data_dir 
Fixes ca_trust_dir and project_data_dir for Kubernetes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-20 02:19:25 +00:00
softwarefactory-project-zuul[bot] 1f3242900a Merge pull request #4098 from beeankha/any_notification_migration 
Update "Notify On Start" Migration File

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
 2019-06-19 19:57:12 +00:00
softwarefactory-project-zuul[bot] e6232957b4 Merge pull request #4079 from ryanpetrello/ldap-setting-flake 
work around a unit test that's periodically flaky

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-19 18:55:24 +00:00
softwarefactory-project-zuul[bot] c585c3d07d Merge pull request #4105 from rooftopcellist/fix_instance_counts 
Fixes analytics & metrics instance specific job counts

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-19 16:49:09 +00:00
softwarefactory-project-zuul[bot] 1413c1be7b Merge pull request #4074 from ryanpetrello/whoopsie 
fix a bug introduced in the inventory source detail API by v1 removal

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-19 15:52:47 +00:00
softwarefactory-project-zuul[bot] 9c06dc7106 Merge pull request #4106 from shanemcd/fix-offline-builds 
Downgrade pip

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-18 23:17:48 +00:00
softwarefactory-project-zuul[bot] e3750f541e Merge pull request #4096 from mabashian/4091-workflow-form 
Fix field enablement on workflow form

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-18 16:15:57 +00:00
softwarefactory-project-zuul[bot] 5d49fe2170 Merge pull request #4097 from shanemcd/five-dot-oh-dot-oh 
Bump version to AWX 5.0.0

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-18 14:43:25 +00:00
softwarefactory-project-zuul[bot] ca0e8102fd Merge pull request #3982 from beeankha/notify_on_start 
Notification On Job Start

Reviewed-by: Bianca Henderson <beeankha@gmail.com>
             https://github.com/beeankha
 2019-06-18 14:23:58 +00:00
softwarefactory-project-zuul[bot] 1897b18a6e Merge pull request #4090 from Spredzy/bump_pip 
Makefile: align pip and setuptools bump

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-17 20:52:44 +00:00
softwarefactory-project-zuul[bot] 5ed7db8cc2 Merge pull request #4085 from mabashian/4082-inv_obj 
Ensure inventory_obj is on scope before checking it

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-17 18:08:43 +00:00
softwarefactory-project-zuul[bot] 049b3a2e87 Merge pull request #4080 from AlanCoding/no_more_v1 
Remove code used defunct jobs list POST

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-15 01:02:24 +00:00
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