Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 0 deletions

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 8e3241a2e4c..43beae3f50d 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -46,6 +46,8 @@ Sidekiq.configure_server do |config|
 
   config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
 
+  config.death_handlers << Gitlab::SidekiqDeathHandler.method(:handler)
+
   config.on :startup do
     # Clear any connections that might have been obtained before starting
     # Sidekiq (e.g. in an initializer).
diff --git a/config/routes/repository_scoped.rb b/config/routes/repository_scoped.rb
index 865a5bdb5a9..7fabf3ff895 100644
--- a/config/routes/repository_scoped.rb
+++ b/config/routes/repository_scoped.rb
@@ -34,6 +34,7 @@ scope format: false do
     scope constraints: { id: /[^\0]+?/ } do
       scope controller: :static_site_editor do
         get '/sse/:id(/*vueroute)', action: :show, as: :show_sse
+        get '/sse', as: :root_sse, action: :index
       end
     end
   end
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 82a171103bc..ac339bae2a9 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -308,6 +308,8 @@
   - 2
 - - service_desk_email_receiver
   - 1
+- - set_user_status_based_on_user_cap_setting
+  - 1
 - - status_page_publish
   - 1
 - - sync_seat_link_request