diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-12-05 11:07:57 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-12-05 11:07:57 +0000 |
| commit | 0f90fd639c9ed387426e0a8ec3a23ac33b37024c (patch) | |
| tree | fe5951138e06bfcccd4f2474ef773078896e2f0e /spec/workers | |
| parent | ca075c918a2eceaa02fa8b2ff2da4434c0900b2d (diff) | |
| parent | 4681ab1df1c3d05af58335dd065ae1834aab5d35 (diff) | |
| download | gitlab-ce-0f90fd639c9ed387426e0a8ec3a23ac33b37024c.tar.gz | |
Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master'
Rename MWBS service to Merge When Pipeline Succeeds
## What does this MR do?
This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] All builds are passing
## What are the relevant issue numbers?
Closes #23354
See merge request !7135
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/pipeline_success_worker_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/workers/pipeline_success_worker_spec.rb b/spec/workers/pipeline_success_worker_spec.rb index 5e31cc2c8e7..d1c84adda6f 100644 --- a/spec/workers/pipeline_success_worker_spec.rb +++ b/spec/workers/pipeline_success_worker_spec.rb @@ -7,7 +7,7 @@ describe PipelineSuccessWorker do it 'performs "merge when pipeline succeeds"' do expect_any_instance_of( - MergeRequests::MergeWhenBuildSucceedsService + MergeRequests::MergeWhenPipelineSucceedsService ).to receive(:trigger) described_class.new.perform(pipeline.id) |