diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 12:06:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 12:06:03 +0300 |
| commit | b3e4ec8e8adf4fe96c982124e91b6a05021a9cda (patch) | |
| tree | 5fda0011a7cc7de000186e465e61f893d478a1c8 /spec/services/auto_merge | |
| parent | 90cdc9391171e1be29b2b57a2e2aad0c02c2a7a9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/auto_merge')
| -rw-r--r-- | spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb | 2 |
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 |