diff options
| author | James Lopez <james@gitlab.com> | 2019-03-03 15:34:52 +0300 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-03-03 15:34:52 +0300 |
| commit | 1c706c680708d82e4a960fa6f7a807ec7fea1d09 (patch) | |
| tree | b2cac80d543a7c3129491d44c71be4971c695e72 | |
| parent | 190a6a1e6728ff9425154fe9ccacaa75039854c7 (diff) | |
| parent | b6a972787048a2ab9024051ecfe40f1a46bcc67d (diff) | |
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
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-show-pre-receive-error-merge.yml | 5 | ||||
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 2 |
3 files changed, 7 insertions, 3 deletions
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') diff --git a/changelogs/unreleased/sh-show-pre-receive-error-merge.yml b/changelogs/unreleased/sh-show-pre-receive-error-merge.yml new file mode 100644 index 00000000000..5e662b34773 --- /dev/null +++ b/changelogs/unreleased/sh-show-pre-receive-error-merge.yml @@ -0,0 +1,5 @@ +--- +title: Show pre-receive error message when merge fails +merge_request: 25708 +author: +type: fixed diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index ede79b87bcc..9d674263259 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -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 |