diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-21 08:31:07 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-05-21 13:50:48 +0000 |
commit | e392de2397aef86cd8275792ef88586647aeed90 (patch) | |
tree | b8f7a19a27250a0a3befe897e00cb33ecfb505b9 | |
parent | 234a91c9a777a722f69d6753babb6cf07d5534eb (diff) | |
download | gitlab-ce-e392de2397aef86cd8275792ef88586647aeed90.tar.gz |
Merge branch 'revert-47e5eedc' into 'master'
Revert "Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' into 'master'"
See merge request gitlab-org/gitlab-ce!28492
(cherry picked from commit a5f810c9b18d63778a9cd5dc1d2c288e68b1497a)
c04ea583 Revert "Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' into 'master'"
-rw-r--r-- | changelogs/unreleased/55127-add-delay-after-mr-creation-for-async-tasks-to-complete.yml | 5 | ||||
-rw-r--r-- | lib/api/merge_requests.rb | 4 | ||||
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 27 |
3 files changed, 0 insertions, 36 deletions
diff --git a/changelogs/unreleased/55127-add-delay-after-mr-creation-for-async-tasks-to-complete.yml b/changelogs/unreleased/55127-add-delay-after-mr-creation-for-async-tasks-to-complete.yml deleted file mode 100644 index ac3bb596842..00000000000 --- a/changelogs/unreleased/55127-add-delay-after-mr-creation-for-async-tasks-to-complete.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Wait for pipeline creation to complete before accepting a MR via API -merge_request: 27978 -author: kerrizor -type: fixed diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index daa98c22e5e..ce85772e4ed 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -367,10 +367,6 @@ module API merge_request = find_project_merge_request(params[:merge_request_iid]) merge_when_pipeline_succeeds = to_boolean(params[:merge_when_pipeline_succeeds]) - if merge_when_pipeline_succeeds || merge_request.merge_when_pipeline_succeeds - render_api_error!('Not allowed: pipeline does not exist', 405) unless merge_request.head_pipeline - end - # Merge request can not be merged # because user dont have permissions to push into target branch unauthorized! unless merge_request.can_be_merged_by?(current_user) diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 007f3517e64..5c94a87529b 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -1495,33 +1495,6 @@ describe API::MergeRequests do expect(json_response['merge_when_pipeline_succeeds']).to eq(true) end - context 'when the MR requires pipeline success' do - it 'returns 405 if the pipeline is missing' do - allow_any_instance_of(MergeRequest) - .to receive(:merge_when_pipeline_succeeds).and_return(true) - allow_any_instance_of(MergeRequest).to receive(:head_pipeline).and_return(nil) - - put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user) - - expect(response).to have_gitlab_http_status(405) - expect(json_response['message']).to eq('Not allowed: pipeline does not exist') - end - end - - context 'when the request requires pipeline success' do - it 'returns 405 if the pipeline is missing' do - allow_any_instance_of(MergeRequest) - .to receive(:merge_when_pipeline_succeeds).and_return(true) - allow_any_instance_of(MergeRequest).to receive(:head_pipeline).and_return(nil) - - put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), - params: { merge_when_pipeline_succeeds: true } - - expect(response).to have_gitlab_http_status(405) - expect(json_response['message']).to eq('Not allowed: pipeline does not exist') - end - end - it "returns 404 for an invalid merge request IID" do put api("/projects/#{project.id}/merge_requests/12345/merge", user) |