diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-02 10:29:04 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-02 17:31:09 +0300 |
| commit | b6a972787048a2ab9024051ecfe40f1a46bcc67d (patch) | |
| tree | 94f1db9a8bcd3533ff8e5e0f05a27f4f702b40de | |
| parent | 5c9aa45489aee7cd1edaa15a30fb8a3aa24417a8 (diff) | |
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
| -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 |