diff options
author | Robert Speicher <robert@gitlab.com> | 2018-07-17 19:53:00 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-07-17 19:53:00 +0300 |
commit | 29d1629f1e42b772be96fdc46044c35e2cfb42d2 (patch) | |
tree | 182e353837ac8ae527efe89a4c314e50a4dd9c79 /lib/banzai | |
parent | d015702f2a99264302344ddd7b933eed9c7c3d0f (diff) | |
parent | 148128e987e7b6f7d77485b1a5e72b26c53bb607 (diff) |
Merge branch 'extract-ee-specific-banzai-filters' into 'master'
Extract EE-specific lines from Banzai pipelines
See merge request gitlab-org/gitlab-ce!20636
Diffstat (limited to 'lib/banzai')
-rw-r--r-- | lib/banzai/pipeline/gfm_pipeline.rb | 18 | ||||
-rw-r--r-- | lib/banzai/pipeline/post_process_pipeline.rb | 12 | ||||
-rw-r--r-- | lib/banzai/pipeline/single_line_pipeline.rb | 8 |
3 files changed, 28 insertions, 10 deletions
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb index 0d9b874ef85..5dab80dd3eb 100644 --- a/lib/banzai/pipeline/gfm_pipeline.rb +++ b/lib/banzai/pipeline/gfm_pipeline.rb @@ -24,6 +24,17 @@ module Banzai Filter::AutolinkFilter, Filter::ExternalLinkFilter, + *reference_filters, + + Filter::TaskListFilter, + Filter::InlineDiffFilter, + + Filter::SetDirectionFilter + ] + end + + def self.reference_filters + [ Filter::UserReferenceFilter, Filter::IssueReferenceFilter, Filter::ExternalIssueReferenceFilter, @@ -32,12 +43,7 @@ module Banzai Filter::CommitRangeReferenceFilter, Filter::CommitReferenceFilter, Filter::LabelReferenceFilter, - Filter::MilestoneReferenceFilter, - - Filter::TaskListFilter, - Filter::InlineDiffFilter, - - Filter::SetDirectionFilter + Filter::MilestoneReferenceFilter ] end diff --git a/lib/banzai/pipeline/post_process_pipeline.rb b/lib/banzai/pipeline/post_process_pipeline.rb index dcd52bc03c7..0b2e584ef16 100644 --- a/lib/banzai/pipeline/post_process_pipeline.rb +++ b/lib/banzai/pipeline/post_process_pipeline.rb @@ -2,11 +2,17 @@ module Banzai module Pipeline class PostProcessPipeline < BasePipeline def self.filters - FilterArray[ + @filters ||= FilterArray[ + *internal_link_filters, + Filter::AbsoluteLinkFilter + ] + end + + def self.internal_link_filters + [ Filter::RedactorFilter, Filter::RelativeLinkFilter, - Filter::IssuableStateFilter, - Filter::AbsoluteLinkFilter + Filter::IssuableStateFilter ] end diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb index 1929099931b..cd5a6c8875c 100644 --- a/lib/banzai/pipeline/single_line_pipeline.rb +++ b/lib/banzai/pipeline/single_line_pipeline.rb @@ -10,13 +10,19 @@ module Banzai Filter::AutolinkFilter, Filter::ExternalLinkFilter, + *reference_filters + ] + end + + def self.reference_filters + [ Filter::UserReferenceFilter, Filter::IssueReferenceFilter, Filter::ExternalIssueReferenceFilter, Filter::MergeRequestReferenceFilter, Filter::SnippetReferenceFilter, Filter::CommitRangeReferenceFilter, - Filter::CommitReferenceFilter, + Filter::CommitReferenceFilter ] end end |