Merge branch 'allow-emoji-in-references' into 'master'

Allow references to labels and milestones to contain emoji

Closes #37762, #53756, and #40728

See merge request gitlab-org/gitlab-ce!29284

3 files changed, 29 insertions, 1 deletions

diff --git a/changelogs/unreleased/allow-emoji-in-references.yml b/changelogs/unreleased/allow-emoji-in-references.yml
new file mode 100644
index 00000000000..3116b346c00
--- /dev/null
+++ b/changelogs/unreleased/allow-emoji-in-references.yml
@@ -0,0 +1,5 @@
+---
+title: Allow references to labels and milestones to contain emoji
+merge_request: 29284
+author:
+type: changed
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index 30cafd11834..d67f461be57 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -25,7 +25,6 @@ module Banzai
           Filter::VideoLinkFilter,
           Filter::ImageLazyLoadFilter,
           Filter::ImageLinkFilter,
-          Filter::EmojiFilter,
           Filter::TableOfContentsFilter,
           Filter::AutolinkFilter,
           Filter::ExternalLinkFilter,
@@ -34,6 +33,7 @@ module Banzai
 
           *reference_filters,
 
+          Filter::EmojiFilter,
           Filter::TaskListFilter,
           Filter::InlineDiffFilter,
 
diff --git a/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb b/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb
index 91b0499375d..7119c826bca 100644
--- a/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb
@@ -117,4 +117,27 @@ describe Banzai::Pipeline::GfmPipeline do
       expect(output).not_to include("javascript")
     end
   end
+
+  describe 'emoji in references' do
+    set(:project) { create(:project, :public) }
+    let(:emoji) { '💯' }
+
+    it 'renders a label reference with emoji inside' do
+      create(:label, project: project, name: emoji)
+
+      output = described_class.to_html("#{Label.reference_prefix}\"#{emoji}\"", project: project)
+
+      expect(output).to include(emoji)
+      expect(output).to include(Gitlab::Routing.url_helpers.project_issues_path(project, label_name: emoji))
+    end
+
+    it 'renders a milestone reference with emoji inside' do
+      milestone = create(:milestone, project: project, title: emoji)
+
+      output = described_class.to_html("#{Milestone.reference_prefix}\"#{emoji}\"", project: project)
+
+      expect(output).to include(emoji)
+      expect(output).to include(Gitlab::Routing.url_helpers.milestone_path(milestone))
+    end
+  end
 end