diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-21 17:40:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-21 17:40:34 +0000 |
| commit | 62e0877d5a2290403975667eb679dc94a2340655 (patch) | |
| tree | f166e1cd9d3e4e734f8d83f6bc2682632a430c7c /spec/services/merge_requests | |
| parent | fd2c20bcad885645b79021cd4b7fccc244c2dcce (diff) | |
| parent | e902f462c213d1bb0cc56f298c7bef01befa0616 (diff) | |
| download | gitlab-ce-62e0877d5a2290403975667eb679dc94a2340655.tar.gz | |
Merge branch '54230-eliminate-duplicated-words-in-apps' into 'master'
Eliminate duplicated words (in apps)
Closes #54230
See merge request gitlab-org/gitlab-ce!23184
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb index 8838742a637..52bbd4e794d 100644 --- a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb +++ b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb @@ -95,7 +95,7 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do sha: '1234abcdef', status: 'success') end - it 'it does not merge merge request' do + it 'it does not merge request' do expect(MergeWorker).not_to receive(:perform_async) service.trigger(old_pipeline) end |