diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /lib/banzai/pipeline | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'lib/banzai/pipeline')
-rw-r--r-- | lib/banzai/pipeline/gfm_pipeline.rb | 4 | ||||
-rw-r--r-- | lib/banzai/pipeline/plain_markdown_pipeline.rb | 4 | ||||
-rw-r--r-- | lib/banzai/pipeline/single_line_pipeline.rb | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb index 344afc9b33c..e5ec0a0a006 100644 --- a/lib/banzai/pipeline/gfm_pipeline.rb +++ b/lib/banzai/pipeline/gfm_pipeline.rb @@ -34,6 +34,7 @@ module Banzai Filter::FootnoteFilter, *reference_filters, Filter::EmojiFilter, + Filter::CustomEmojiFilter, Filter::TaskListFilter, Filter::InlineDiffFilter, Filter::SetDirectionFilter @@ -61,7 +62,8 @@ module Banzai Filter::CommitReferenceFilter, Filter::LabelReferenceFilter, Filter::MilestoneReferenceFilter, - Filter::AlertReferenceFilter + Filter::AlertReferenceFilter, + Filter::FeatureFlagReferenceFilter ] end diff --git a/lib/banzai/pipeline/plain_markdown_pipeline.rb b/lib/banzai/pipeline/plain_markdown_pipeline.rb index b64f13cde47..1da0f72996b 100644 --- a/lib/banzai/pipeline/plain_markdown_pipeline.rb +++ b/lib/banzai/pipeline/plain_markdown_pipeline.rb @@ -5,7 +5,9 @@ module Banzai class PlainMarkdownPipeline < BasePipeline def self.filters FilterArray[ - Filter::MarkdownFilter + Filter::MarkdownPreEscapeFilter, + Filter::MarkdownFilter, + Filter::MarkdownPostEscapeFilter ] end end diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb index a2fe6d52a90..4bf98099662 100644 --- a/lib/banzai/pipeline/single_line_pipeline.rb +++ b/lib/banzai/pipeline/single_line_pipeline.rb @@ -24,7 +24,8 @@ module Banzai Filter::SnippetReferenceFilter, Filter::CommitRangeReferenceFilter, Filter::CommitReferenceFilter, - Filter::AlertReferenceFilter + Filter::AlertReferenceFilter, + Filter::FeatureFlagReferenceFilter ] end |