diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-06-10 23:34:17 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-06-10 23:34:17 +0000 |
| commit | a0de879d91010105572b3bea6589d7c790ee3432 (patch) | |
| tree | f11f9ce2e36adb7e2ac567f6420e8e64ad2d8570 /lib | |
| parent | 20bb0d66f211da3828367004421eb15edd5ddb27 (diff) | |
| parent | 1617aa27562c6c92c981cadf13f0fb999558e1cc (diff) | |
| download | gitlab-ce-a0de879d91010105572b3bea6589d7c790ee3432.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/pipeline/gfm_pipeline.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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, |