diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 16:34:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 16:34:10 +0000 |
| commit | bfa4e0b43c216ba5f3201058668d3a65743a9910 (patch) | |
| tree | 2265d2644cc8821128a3de731aff762b14564690 /spec/services/merge_requests | |
| parent | 6689552c4793623a9d47986328a0379ab215f9bc (diff) | |
| download | gitlab-ce-bfa4e0b43c216ba5f3201058668d3a65743a9910.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/ff_merge_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/ff_merge_service_spec.rb b/spec/services/merge_requests/ff_merge_service_spec.rb index 55856deeaca..5c44af87470 100644 --- a/spec/services/merge_requests/ff_merge_service_spec.rb +++ b/spec/services/merge_requests/ff_merge_service_spec.rb @@ -116,7 +116,7 @@ RSpec.describe MergeRequests::FfMergeService do error_message = 'error message' raw_message = 'The truth is out there' - pre_receive_error = Gitlab::Git::PreReceiveError.new(raw_message, "GitLab: #{error_message}") + pre_receive_error = Gitlab::Git::PreReceiveError.new(raw_message, fallback_message: error_message) allow(service).to receive(:repository).and_raise(pre_receive_error) allow(service).to receive(:execute_hooks) expect(Gitlab::ErrorTracking).to receive(:track_exception).with( |