summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-12-05 11:07:57 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-12-05 11:07:57 +0000
commit0f90fd639c9ed387426e0a8ec3a23ac33b37024c (patch)
treefe5951138e06bfcccd4f2474ef773078896e2f0e /spec/requests
parentca075c918a2eceaa02fa8b2ff2da4434c0900b2d (diff)
parent4681ab1df1c3d05af58335dd065ae1834aab5d35 (diff)
downloadgitlab-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/requests')
-rw-r--r--spec/requests/api/merge_requests_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 918a71129f7..0b89ac7960e 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -465,7 +465,7 @@ describe API::MergeRequests, api: true do
expect(response).to have_http_status(200)
end
- it "enables merge when build succeeds if the ci is active" do
+ it "enables merge when pipeline succeeds if the pipeline is active" do
allow_any_instance_of(MergeRequest).to receive(:head_pipeline).and_return(pipeline)
allow(pipeline).to receive(:active?).and_return(true)