Merge branch '36262_merge_request_reference_in_merge_commit_global' into 'master'

fix Merge request reference in merge commit is not global

Closes #36262

See merge request !13518

4 files changed, 9 insertions, 5 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index dde43e94cb5..dbc73ed3cd4 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -683,9 +683,8 @@ class MergeRequest < ActiveRecord::Base
     if !include_description && closes_issues_references.present?
       message << "Closes #{closes_issues_references.to_sentence}"
     end
-
     message << "#{description}" if include_description && description.present?
-    message << "See merge request #{to_reference}"
+    message << "See merge request #{to_reference(full: true)}"
 
     message.join("\n\n")
   end
diff --git a/changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml b/changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml
new file mode 100644
index 00000000000..356857d6e8a
--- /dev/null
+++ b/changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml
@@ -0,0 +1,5 @@
+---
+title: Merge request reference in merge commit changed to full reference
+merge_request: 13518
+author: haseebeqx
+type: fixed
diff --git a/spec/features/merge_requests/merge_commit_message_toggle_spec.rb b/spec/features/merge_requests/merge_commit_message_toggle_spec.rb
index 429bc277d73..08a3bb84aac 100644
--- a/spec/features/merge_requests/merge_commit_message_toggle_spec.rb
+++ b/spec/features/merge_requests/merge_commit_message_toggle_spec.rb
@@ -19,7 +19,7 @@ feature 'Clicking toggle commit message link', js: true do
       "Merge branch 'feature' into 'master'",
       merge_request.title,
       "Closes #{issue_1.to_reference} and #{issue_2.to_reference}",
-      "See merge request #{merge_request.to_reference}"
+      "See merge request #{merge_request.to_reference(full: true)}"
     ].join("\n\n")
   end
   let(:message_with_description) do
@@ -27,7 +27,7 @@ feature 'Clicking toggle commit message link', js: true do
       "Merge branch 'feature' into 'master'",
       merge_request.title,
       merge_request.description,
-      "See merge request #{merge_request.to_reference}"
+      "See merge request #{merge_request.to_reference(full: true)}"
     ].join("\n\n")
   end
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 1c72513520d..2d10c6ef1da 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -604,7 +604,7 @@ describe MergeRequest do
       request = build_stubbed(:merge_request)
 
       expect(request.merge_commit_message)
-        .to match("See merge request #{request.to_reference}")
+        .to match("See merge request #{request.to_reference(full: true)}")
     end
 
     it 'excludes multiple linebreak runs when description is blank' do