summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-08 17:46:35 +0100
committerRémy Coutable <remy@rymai.me>2016-12-08 18:17:01 +0100
commit91530aac3f80cda6ba899891ab5bed2ab5869cad (patch)
tree0a09fae8e16aedd3d75f9f648803e47934379159
parent10d4b20ad18b735e45da492a1af30b3650df705e (diff)
downloadgitlab-ce-24729-move-emoji_filter-down.tar.gz
Move the EmojiFilter below the LabelReferenceFilter24729-move-emoji_filter-down
This filter is replacing UTF8 emoji with actual <img>, preventing LabelReferenceFilter from detecting a label with emoji in it. Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--changelogs/unreleased/24729-move-emoji_filter-down.yml4
-rw-r--r--lib/banzai/pipeline/gfm_pipeline.rb5
2 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/24729-move-emoji_filter-down.yml b/changelogs/unreleased/24729-move-emoji_filter-down.yml
new file mode 100644
index 00000000000..e6987aa4f1d
--- /dev/null
+++ b/changelogs/unreleased/24729-move-emoji_filter-down.yml
@@ -0,0 +1,4 @@
+---
+title: Move the EmojiFilter below the LabelReferenceFilter
+merge_request:
+author:
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index 5da2d0b008c..55bf656b0f7 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -9,7 +9,6 @@ module Banzai
Filter::UploadLinkFilter,
Filter::VideoLinkFilter,
Filter::ImageLinkFilter,
- Filter::EmojiFilter,
Filter::TableOfContentsFilter,
Filter::AutolinkFilter,
Filter::ExternalLinkFilter,
@@ -24,6 +23,10 @@ module Banzai
Filter::LabelReferenceFilter,
Filter::MilestoneReferenceFilter,
+ # This filter is replacing UTF8 emoji with actual <img>, preventing
+ # LabelReferenceFilter from detecting a label with emoji in it
+ Filter::EmojiFilter,
+
Filter::TaskListFilter,
Filter::InlineDiffFilter,