diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-01-25 20:30:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-01-25 20:30:29 +0000 |
| commit | e74c6ae6b60900c7f0b6a34c843fa2630a4685bc (patch) | |
| tree | a65191948ae860397df698dfbc85ba91c96f4e85 /spec/spec_helper.rb | |
| parent | 844bf10847af67d2561ef137fcfbe6ba61204e6c (diff) | |
| parent | 88e627cf14b47ca5d63f2cb0ffe24124fb4b116a (diff) | |
| download | gitlab-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/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f78899134d5..e160c11111b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,7 +7,6 @@ ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'shoulda/matchers' -require 'sidekiq/testing/inline' require 'rspec/retry' if ENV['CI'] && !ENV['NO_KNAPSACK'] |