Merge branch 'glm-shorthand-reference' into 'master'

GLM shorthand reference for projects from the same namespace

Closes #21679

See merge request !7255

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index c7de0d0c534..db196ed5751 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -189,7 +189,7 @@ describe Issues::MoveService, services: true do
 
           it 'rewrites references using a cross reference to old project' do
             expect(new_note.note)
-              .to eq "Note with reference to merge request #{old_project.to_reference}!1"
+              .to eq "Note with reference to merge request #{old_project.to_reference(new_project)}!1"
           end
         end
 
@@ -217,7 +217,7 @@ describe Issues::MoveService, services: true do
 
           it 'rewrites referenced issues creating cross project reference' do
             expect(new_issue.description)
-              .to eq "Some description #{old_project.to_reference}#{another_issue.to_reference}"
+              .to eq "Some description #{another_issue.to_reference(new_project)}"
           end
         end
 
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 435cfb07292..4bffe622d72 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -530,7 +530,7 @@ describe SystemNoteService, services: true do
       end
 
       it 'mentions referenced project' do
-        expect(subject.note).to include new_project.to_reference
+        expect(subject.note).to include new_project.path_with_namespace
       end
     end