diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 03:08:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 03:08:46 +0300 |
commit | 6755df108b123ecc8ae330d7c7bf2f04fbf36a81 (patch) | |
tree | 7609bd6c0a9ac607d8f57737a2c27a460b7fcfdd /spec/services/system_note_service_spec.rb | |
parent | ee7fba4b844935437233f6c5b74545a28bac4298 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/system_note_service_spec.rb')
-rw-r--r-- | spec/services/system_note_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 4ba22af85f0..40772297cce 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -314,7 +314,7 @@ describe SystemNoteService do url = if type == 'commit' "#{Settings.gitlab.base_url}/#{project.namespace.path}/#{project.path}/commit/#{commit.id}" else - "#{Settings.gitlab.base_url}/#{project.namespace.path}/#{project.path}/merge_requests/#{merge_request.iid}" + "#{Settings.gitlab.base_url}/#{project.namespace.path}/#{project.path}/-/merge_requests/#{merge_request.iid}" end link = double(object: { 'url' => url }) |