diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-21 08:31:07 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-21 08:31:07 +0000 |
| commit | a5f810c9b18d63778a9cd5dc1d2c288e68b1497a (patch) | |
| tree | 0a3403bcf0cb557f1090a5f5fffc68e9dc5be711 /lib | |
| parent | 329a2a0f6339bf8ae90a5dfcc03fcd16335a70c9 (diff) | |
| parent | c04ea58350083c3230c3031eefb94875cde2cb6c (diff) | |
| download | gitlab-ce-a5f810c9b18d63778a9cd5dc1d2c288e68b1497a.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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/merge_requests.rb | 4 |
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) |