Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/lib/gitlab/hashed_storage/migrator_spec.rb b/spec/lib/gitlab/hashed_storage/migrator_spec.rb
index 8e253b51597..ce7f2c4530d 100644
--- a/spec/lib/gitlab/hashed_storage/migrator_spec.rb
+++ b/spec/lib/gitlab/hashed_storage/migrator_spec.rb
@@ -42,7 +42,7 @@ describe Gitlab::HashedStorage::Migrator, :sidekiq, :redis do
       subject.bulk_migrate(start: ids.min, finish: ids.max)
     end
 
-    it 'has all projects migrated and set as writable' do
+    it 'has all projects migrated and set as writable', :sidekiq_might_not_need_inline do
       perform_enqueued_jobs do
         subject.bulk_migrate(start: ids.min, finish: ids.max)
       end
@@ -79,7 +79,7 @@ describe Gitlab::HashedStorage::Migrator, :sidekiq, :redis do
       subject.bulk_rollback(start: ids.min, finish: ids.max)
     end
 
-    it 'has all projects rolledback and set as writable' do
+    it 'has all projects rolledback and set as writable', :sidekiq_might_not_need_inline do
       perform_enqueued_jobs do
         subject.bulk_rollback(start: ids.min, finish: ids.max)
       end
@@ -108,7 +108,7 @@ describe Gitlab::HashedStorage::Migrator, :sidekiq, :redis do
       expect { subject.migrate(project) }.not_to raise_error
     end
 
-    it 'migrates project storage' do
+    it 'migrates project storage', :sidekiq_might_not_need_inline do
       perform_enqueued_jobs do
         subject.migrate(project)
       end
@@ -154,7 +154,7 @@ describe Gitlab::HashedStorage::Migrator, :sidekiq, :redis do
       expect { subject.rollback(project) }.not_to raise_error
     end
 
-    it 'rolls-back project storage' do
+    it 'rolls-back project storage', :sidekiq_might_not_need_inline do
       perform_enqueued_jobs do
         subject.rollback(project)
       end