summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-29 12:10:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-29 12:10:06 +0000
commitb860c6ba2607541e3b5bdf0fc2daaa9ed41a8726 (patch)
tree73f76e7e69f9902c0e758edd5275cad7f4cb20de /config
parent6b13a226ddfc49140d58e7e88f8703ae0ed90574 (diff)
downloadgitlab-ce-b860c6ba2607541e3b5bdf0fc2daaa9ed41a8726.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sidekiq.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 35e67e04bfb..b4a1e0da41a 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -118,8 +118,5 @@ end
Sidekiq.configure_client do |config|
config.redis = queues_config_hash
- config.client_middleware do |chain|
- chain.add Gitlab::SidekiqMiddleware::CorrelationInjector
- chain.add Gitlab::SidekiqStatus::ClientMiddleware
- end
+ config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
end