diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 12:08:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 12:08:35 +0000 |
| commit | 22e9af3c8b8aedf7f46b786be968862b74a2d07e (patch) | |
| tree | a10a7d9af40a17fe6cda7b3a681f5e5e2112c16e /spec/services/system_notes | |
| parent | c8e28a0bb8dd45d91cb72ff2c930bc4a562f1fc7 (diff) | |
| download | gitlab-ce-22e9af3c8b8aedf7f46b786be968862b74a2d07e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/system_notes')
| -rw-r--r-- | spec/services/system_notes/merge_requests_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/system_notes/merge_requests_service_spec.rb b/spec/services/system_notes/merge_requests_service_spec.rb index 2a04e888ae0..f5c071502f5 100644 --- a/spec/services/system_notes/merge_requests_service_spec.rb +++ b/spec/services/system_notes/merge_requests_service_spec.rb @@ -253,7 +253,7 @@ describe ::SystemNotes::MergeRequestsService do end it "posts the 'picked merge request' system note" do - expect(subject.note).to eq("picked this merge request into branch [`#{branch_name}`](/#{project.full_path}/tree/#{branch_name}) with commit #{commit_sha}") + expect(subject.note).to eq("picked this merge request into branch [`#{branch_name}`](/#{project.full_path}/-/tree/#{branch_name}) with commit #{commit_sha}") end it 'links the merge request and the cherry-pick commit' do |