kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

This reverts merge request !25708
This commit is contained in:
Luke Duncalfe 2019-03-07 21:11:28 +00:00 committed by Luke Duncalfe
parent 1de36fd2ee
commit 33205b08c9
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/services/merge_requests/merge_service.rb
View File

@ -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')

5
changelogs/unreleased/sh-show-pre-receive-error-merge.yml
View File

@ -1,5 +0,0 @@
---
title: Show pre-receive error message when merge fails
merge_request: 25708
author:
type: fixed

2
spec/services/merge_requests/merge_service_spec.rb
View File

@ -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: #{error_message}")
expect(merge_request.merge_error).to include('Something went wrong during merge pre-receive hook')
expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
end