diff options
| author | Luke Duncalfe <lduncalfe@gitlab.com> | 2019-03-08 00:11:28 +0300 |
|---|---|---|
| committer | Luke Duncalfe <lduncalfe@eml.cc> | 2019-03-08 01:07:48 +0300 |
| commit | 33205b08c9a425c8338a8292fa0b389db355c7a6 (patch) | |
| tree | 96e6d3d293812d59876780bc9e7b1f42a03a9070 /app | |
| parent | 1de36fd2eef900a93606e1c0558f736ad88717cd (diff) | |
Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"
This reverts merge request !25708
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index b29e0b1759e..8241e408ce5 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -76,7 +76,8 @@ module MergeRequests def try_merge repository.merge(current_user, source, merge_request, commit_message) rescue Gitlab::Git::PreReceiveError => e - raise_error("Something went wrong during merge pre-receive hook: #{e.message}") + handle_merge_error(log_message: e.message) + raise_error('Something went wrong during merge pre-receive hook') rescue => e handle_merge_error(log_message: e.message) raise_error('Something went wrong during merge') |