diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 15:09:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 15:09:24 +0300 |
commit | a9ced7da447785c57477b3d8dbccc73a78cface1 (patch) | |
tree | 5179d27ab9d801748ee4ed1c64c985974e799812 /lib/banzai | |
parent | ad0265eead72a624ce7a020847db4f0f0c877e57 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai')
-rw-r--r-- | lib/banzai/filter/epic_reference_filter.rb | 4 | ||||
-rw-r--r-- | lib/banzai/issuable_extractor.rb | 4 | ||||
-rw-r--r-- | lib/banzai/pipeline/gfm_pipeline.rb | 4 | ||||
-rw-r--r-- | lib/banzai/pipeline/post_process_pipeline.rb | 4 | ||||
-rw-r--r-- | lib/banzai/pipeline/single_line_pipeline.rb | 4 | ||||
-rw-r--r-- | lib/banzai/reference_parser/epic_parser.rb | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/lib/banzai/filter/epic_reference_filter.rb b/lib/banzai/filter/epic_reference_filter.rb index d1e1a56424d..70a6cb0a6dc 100644 --- a/lib/banzai/filter/epic_reference_filter.rb +++ b/lib/banzai/filter/epic_reference_filter.rb @@ -4,8 +4,6 @@ module Banzai module Filter # The actual filter is implemented in the EE mixin class EpicReferenceFilter < IssuableReferenceFilter - prepend_if_ee('EE::Banzai::Filter::EpicReferenceFilter') # rubocop: disable Cop/InjectEnterpriseEditionModule - self.reference_type = :epic def self.object_class @@ -20,3 +18,5 @@ module Banzai end end end + +Banzai::Filter::EpicReferenceFilter.prepend_if_ee('EE::Banzai::Filter::EpicReferenceFilter') diff --git a/lib/banzai/issuable_extractor.rb b/lib/banzai/issuable_extractor.rb index d1e8587314c..8994cdbed60 100644 --- a/lib/banzai/issuable_extractor.rb +++ b/lib/banzai/issuable_extractor.rb @@ -9,8 +9,6 @@ module Banzai # so we can avoid N+1 queries problem class IssuableExtractor - prepend_if_ee('EE::Banzai::IssuableExtractor') # rubocop: disable Cop/InjectEnterpriseEditionModule - attr_reader :context ISSUE_REFERENCE_TYPE = '@data-reference-type="issue"' @@ -59,3 +57,5 @@ module Banzai end end end + +Banzai::IssuableExtractor.prepend_if_ee('EE::Banzai::IssuableExtractor') diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb index b6238dfe7f0..329bbb270bd 100644 --- a/lib/banzai/pipeline/gfm_pipeline.rb +++ b/lib/banzai/pipeline/gfm_pipeline.rb @@ -3,8 +3,6 @@ module Banzai module Pipeline class GfmPipeline < BasePipeline - prepend_if_ee('EE::Banzai::Pipeline::GfmPipeline') # rubocop: disable Cop/InjectEnterpriseEditionModule - # These filters transform GitLab Flavored Markdown (GFM) to HTML. # The nodes and marks referenced in app/assets/javascripts/behaviors/markdown/editor_extensions.js # consequently transform that same HTML to GFM to be copied to the clipboard. @@ -77,3 +75,5 @@ module Banzai end end end + +Banzai::Pipeline::GfmPipeline.prepend_if_ee('EE::Banzai::Pipeline::GfmPipeline') diff --git a/lib/banzai/pipeline/post_process_pipeline.rb b/lib/banzai/pipeline/post_process_pipeline.rb index 8236b702147..32d7126c97d 100644 --- a/lib/banzai/pipeline/post_process_pipeline.rb +++ b/lib/banzai/pipeline/post_process_pipeline.rb @@ -3,8 +3,6 @@ module Banzai module Pipeline class PostProcessPipeline < BasePipeline - prepend_if_ee('EE::Banzai::Pipeline::PostProcessPipeline') # rubocop: disable Cop/InjectEnterpriseEditionModule - def self.filters @filters ||= FilterArray[ *internal_link_filters, @@ -34,3 +32,5 @@ module Banzai end end end + +Banzai::Pipeline::PostProcessPipeline.prepend_if_ee('EE::Banzai::Pipeline::PostProcessPipeline') diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb index a16ab04b792..7fe13100ec2 100644 --- a/lib/banzai/pipeline/single_line_pipeline.rb +++ b/lib/banzai/pipeline/single_line_pipeline.rb @@ -3,8 +3,6 @@ module Banzai module Pipeline class SingleLinePipeline < GfmPipeline - prepend_if_ee('EE::Banzai::Pipeline::SingleLinePipeline') # rubocop: disable Cop/InjectEnterpriseEditionModule - def self.filters @filters ||= FilterArray[ Filter::HtmlEntityFilter, @@ -41,3 +39,5 @@ module Banzai end end end + +Banzai::Pipeline::SingleLinePipeline.prepend_if_ee('EE::Banzai::Pipeline::SingleLinePipeline') diff --git a/lib/banzai/reference_parser/epic_parser.rb b/lib/banzai/reference_parser/epic_parser.rb index b5fbf7accc4..7e72a260839 100644 --- a/lib/banzai/reference_parser/epic_parser.rb +++ b/lib/banzai/reference_parser/epic_parser.rb @@ -4,8 +4,6 @@ module Banzai module ReferenceParser # The actual parser is implemented in the EE mixin class EpicParser < IssuableParser - prepend_if_ee('::EE::Banzai::ReferenceParser::EpicParser') # rubocop: disable Cop/InjectEnterpriseEditionModule - self.reference_type = :epic def records_for_nodes(_nodes) @@ -14,3 +12,5 @@ module Banzai end end end + +Banzai::ReferenceParser::EpicParser.prepend_if_ee('::EE::Banzai::ReferenceParser::EpicParser') |