summaryrefslogtreecommitdiff
path: root/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb')
-rw-r--r--spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb b/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb
index 931b52470c4..c396539cf56 100644
--- a/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb
+++ b/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb
@@ -225,7 +225,7 @@ describe AutoMerge::MergeWhenPipelineSucceedsService do
test.drop
end
- it 'merges when all stages succeeded' do
+ it 'merges when all stages succeeded', :sidekiq_might_not_need_inline do
expect(MergeWorker).to receive(:perform_async)
build.success