summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-01-25 20:30:29 +0000
committerDouwe Maan <douwe@gitlab.com>2017-01-25 20:30:29 +0000
commite74c6ae6b60900c7f0b6a34c843fa2630a4685bc (patch)
treea65191948ae860397df698dfbc85ba91c96f4e85 /spec/support
parent844bf10847af67d2561ef137fcfbe6ba61204e6c (diff)
parent88e627cf14b47ca5d63f2cb0ffe24124fb4b116a (diff)
downloadgitlab-ce-e74c6ae6b60900c7f0b6a34c843fa2630a4685bc.tar.gz
Merge branch 'refresh-authorizations-fork-join' into 'master'
Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/sidekiq.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb
new file mode 100644
index 00000000000..575d3451150
--- /dev/null
+++ b/spec/support/sidekiq.rb
@@ -0,0 +1,5 @@
+require 'sidekiq/testing/inline'
+
+Sidekiq::Testing.server_middleware do |chain|
+ chain.add Gitlab::SidekiqStatus::ServerMiddleware
+end