Unfold references for group labels when moving issue to another project

1 files changed, 17 insertions, 1 deletions

diff --git a/lib/gitlab/gfm/reference_rewriter.rb b/lib/gitlab/gfm/reference_rewriter.rb
index 78d7a4f27cf..d0b8cd90e0e 100644
--- a/lib/gitlab/gfm/reference_rewriter.rb
+++ b/lib/gitlab/gfm/reference_rewriter.rb
@@ -58,7 +58,7 @@ module Gitlab
         referable = find_referable(reference)
         return reference unless referable
 
-        cross_reference = referable.to_reference(target_project)
+        cross_reference = build_cross_reference(referable, target_project)
         return reference if reference == cross_reference
 
         new_text = before + cross_reference + after
@@ -72,6 +72,22 @@ module Gitlab
         extractor.all.first
       end
 
+      def build_cross_reference(referable, target_project)
+        if referable.respond_to?(:project)
+          referable.to_reference(target_project)
+        else
+          to_reference(referable, target_project)
+        end
+      end
+
+      def to_reference(referable, target_project)
+        if @source_project != target_project
+          @source_project.to_reference + referable.to_reference
+        else
+          referable.to_reference
+        end
+      end
+
       def substitution_valid?(substituted)
         @original_html == markdown(substituted)
       end