From b6a972787048a2ab9024051ecfe40f1a46bcc67d Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 1 Mar 2019 23:29:04 -0800 Subject: Show pre-receive error message in merge request widget When a merge fails due to a locked file, no feedback was given to the user as to why it failed if the user used the Merge button. However, if the push attempt happened directly in the Web UI, the pre-receive message would be displayed. To be consistent and to make it clear why a merge failed, we now include the pre-receive error message in the merge request widget. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10165 --- app/services/merge_requests/merge_service.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/services') diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 8241e408ce5..b29e0b1759e 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -76,8 +76,7 @@ module MergeRequests def try_merge repository.merge(current_user, source, merge_request, commit_message) rescue Gitlab::Git::PreReceiveError => e - handle_merge_error(log_message: e.message) - raise_error('Something went wrong during merge pre-receive hook') + raise_error("Something went wrong during merge pre-receive hook: #{e.message}") rescue => e handle_merge_error(log_message: e.message) raise_error('Something went wrong during merge') -- cgit v1.2.1