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 /spec/services | |
| parent | 1de36fd2eef900a93606e1c0558f736ad88717cd (diff) | |
Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"
This reverts merge request !25708
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 9d674263259..ede79b87bcc 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: #{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 |