Add latest changes from gitlab-org/gitlab@13-4-stable-ee

3 files changed, 4 insertions, 11 deletions

diff --git a/lib/banzai/pipeline/broadcast_message_pipeline.rb b/lib/banzai/pipeline/broadcast_message_pipeline.rb
index e31795e673c..27118269bd0 100644
--- a/lib/banzai/pipeline/broadcast_message_pipeline.rb
+++ b/lib/banzai/pipeline/broadcast_message_pipeline.rb
@@ -7,7 +7,6 @@ module Banzai
         @filters ||= FilterArray[
           Filter::MarkdownFilter,
           Filter::BroadcastMessageSanitizationFilter,
-
           Filter::EmojiFilter,
           Filter::ColorFilter,
           Filter::AutolinkFilter,
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index 10ac813ea15..7057ac9d707 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -12,14 +12,11 @@ module Banzai
       def self.filters
         @filters ||= FilterArray[
           Filter::PlantumlFilter,
-
           # Must always be before the SanitizationFilter to prevent XSS attacks
           Filter::SpacedLinkFilter,
-
           Filter::SanitizationFilter,
           Filter::AssetProxyFilter,
           Filter::SyntaxHighlightFilter,
-
           Filter::MathFilter,
           Filter::ColorFilter,
           Filter::MermaidFilter,
@@ -34,13 +31,10 @@ module Banzai
           Filter::ExternalLinkFilter,
           Filter::SuggestionFilter,
           Filter::FootnoteFilter,
-
           *reference_filters,
-
           Filter::EmojiFilter,
           Filter::TaskListFilter,
           Filter::InlineDiffFilter,
-
           Filter::SetDirectionFilter
         ]
       end
@@ -65,7 +59,8 @@ module Banzai
           Filter::CommitRangeReferenceFilter,
           Filter::CommitReferenceFilter,
           Filter::LabelReferenceFilter,
-          Filter::MilestoneReferenceFilter
+          Filter::MilestoneReferenceFilter,
+          Filter::AlertReferenceFilter
         ]
       end
 
diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb
index 7fe13100ec2..a2fe6d52a90 100644
--- a/lib/banzai/pipeline/single_line_pipeline.rb
+++ b/lib/banzai/pipeline/single_line_pipeline.rb
@@ -8,11 +8,9 @@ module Banzai
           Filter::HtmlEntityFilter,
           Filter::SanitizationFilter,
           Filter::AssetProxyFilter,
-
           Filter::EmojiFilter,
           Filter::AutolinkFilter,
           Filter::ExternalLinkFilter,
-
           *reference_filters
         ]
       end
@@ -25,7 +23,8 @@ module Banzai
           Filter::MergeRequestReferenceFilter,
           Filter::SnippetReferenceFilter,
           Filter::CommitRangeReferenceFilter,
-          Filter::CommitReferenceFilter
+          Filter::CommitReferenceFilter,
+          Filter::AlertReferenceFilter
         ]
       end