diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-30 14:08:51 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-30 14:08:51 +0100 |
| commit | 4681ab1df1c3d05af58335dd065ae1834aab5d35 (patch) | |
| tree | a439bda63ff8ecd1cdd557afab6a96f1f3425179 /spec/requests/api/merge_requests_spec.rb | |
| parent | 00ca7adca2de8ff05cca3df9eb2df8a67f638cfe (diff) | |
| download | gitlab-ce-4681ab1df1c3d05af58335dd065ae1834aab5d35.tar.gz | |
Fix Rubocop offense in merge request specsfix/rename-mwbs-to-merge-when-pipeline-succeeds
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 1e25ae60eef..dce754fa1cb 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -465,7 +465,6 @@ describe API::API, api: true do expect(response).to have_http_status(200) end - 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) |