diff options
| author | Kerri Miller <kerrizor@kerrizor.com> | 2019-05-07 06:05:11 -0700 |
|---|---|---|
| committer | Kerri Miller <kerrizor@kerrizor.com> | 2019-05-07 06:05:11 -0700 |
| commit | 6b0efc83b26b39104139dd6c20226bd654ee8cc3 (patch) | |
| tree | 202c61fa7c6e75979bf4e7685fd8bf22fbf2a07c | |
| parent | a66222773e2bb61d59a6dcb557b6e427297969f4 (diff) | |
| download | gitlab-ce-55127-add-delay-after-mr-creation-for-async-tasks-to-complete.tar.gz | |
Change API error to include short message55127-add-delay-after-mr-creation-for-async-tasks-to-complete
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index c8a1fa49c6c..6847b94a1d2 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -368,7 +368,7 @@ module API merge_when_pipeline_succeeds = to_boolean(params[:merge_when_pipeline_succeeds]) if merge_when_pipeline_succeeds || merge_request.merge_when_pipeline_succeeds - not_allowed! unless merge_request.head_pipeline + render_api_error!('Not allowed: pipeline does not exist', 405) merge_request.head_pipeline end # Merge request can not be merged |