Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-21 13:27:28 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-21 13:27:28 +0300
commitc6a4f9fc5b98024d4af872b0009b90c36bc2e595 (patch)
treec945102da813fb098bdbdaeb65bd6fc5cb69b72e /spec/requests
parentd07ef089c8870b4a5a1c69555c54c93ff1f1fa24 (diff)
Update some docs to reflect MWPS name change
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 7b3d1460c90..212e633c9aa 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -463,7 +463,7 @@ describe API::API, 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(:pipeline).and_return(pipeline)
allow(pipeline).to receive(:active?).and_return(true)