Commit 1c706c68 authored by James Lopez's avatar James Lopez

Merge branch 'sh-show-pre-receive-error-merge' into 'master'

Show pre-receive error message in merge request widget

Closes gitlab-ee#10165

See merge request gitlab-org/gitlab-ce!25708
parents 190a6a1e b6a97278
......@@ -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')
......
---
title: Show pre-receive error message when merge fails
merge_request: 25708
author:
type: fixed
......@@ -244,7 +244,7 @@ describe MergeRequests::MergeService do
service.execute(merge_request)
expect(merge_request.merge_error).to include('Something went wrong during merge pre-receive hook')
expect(merge_request.merge_error).to include("Something went wrong during merge pre-receive hook: #{error_message}")
expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment