Commit 64391691 authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge branch...

Merge branch '199045-broken-master-in-spec-services-system_notes-merge_requests_service_spec-rb-255' into 'master'

Fix a wrong URL in `SystemNotes::MergeRequestsService` spec

Closes #199045

See merge request gitlab-org/gitlab!23764
parents a96c6ce3 a606a05d
...@@ -253,7 +253,7 @@ describe ::SystemNotes::MergeRequestsService do ...@@ -253,7 +253,7 @@ describe ::SystemNotes::MergeRequestsService do
end end
it "posts the 'picked merge request' system note" do 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 end
it 'links the merge request and the cherry-pick commit' do it 'links the merge request and the cherry-pick commit' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment