From 6b0efc83b26b39104139dd6c20226bd654ee8cc3 Mon Sep 17 00:00:00 2001 From: Kerri Miller Date: Tue, 7 May 2019 06:05:11 -0700 Subject: Change API error to include short message --- lib/api/merge_requests.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1