summaryrefslogtreecommitdiff
path: root/lib/api/merge_requests.rb
diff options
context:
space:
mode:
authorKerri Miller <kerrizor@kerrizor.com>2019-05-20 17:37:43 +0000
committerKerri Miller <kerrizor@kerrizor.com>2019-05-20 17:37:43 +0000
commitc04ea58350083c3230c3031eefb94875cde2cb6c (patch)
tree5e8ef329b96779bc014ba8726c94c3d23d03c191 /lib/api/merge_requests.rb
parent0c5b3d08dedccb5808c6df6560b3e277035691db (diff)
downloadgitlab-ce-c04ea58350083c3230c3031eefb94875cde2cb6c.tar.gz
Revert "Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' into 'master'"revert-47e5eedc
This reverts merge request !27978
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r--lib/api/merge_requests.rb4
1 files changed, 0 insertions, 4 deletions
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)