diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /lib/banzai | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'lib/banzai')
-rw-r--r-- | lib/banzai/filter/design_reference_filter.rb | 14 | ||||
-rw-r--r-- | lib/banzai/reference_parser.rb | 4 | ||||
-rw-r--r-- | lib/banzai/reference_parser/mentioned_group_parser.rb | 2 | ||||
-rw-r--r-- | lib/banzai/reference_redactor.rb | 1 |
4 files changed, 6 insertions, 15 deletions
diff --git a/lib/banzai/filter/design_reference_filter.rb b/lib/banzai/filter/design_reference_filter.rb index 2ab47c5c6db..1754fec93d4 100644 --- a/lib/banzai/filter/design_reference_filter.rb +++ b/lib/banzai/filter/design_reference_filter.rb @@ -3,8 +3,6 @@ module Banzai module Filter class DesignReferenceFilter < AbstractReferenceFilter - FEATURE_FLAG = :design_management_reference_filter_gfm_pipeline - class Identifier include Comparable attr_reader :issue_iid, :filename @@ -35,14 +33,6 @@ module Banzai self.reference_type = :design - # This filter must be enabled by setting the - # design_management_reference_filter_gfm_pipeline flag - def call - return doc unless enabled? - - super - end - def find_object(project, identifier) records_per_parent[project][identifier] end @@ -112,10 +102,6 @@ module Banzai .in_groups_of(100, false) # limitation of by_issue_id_and_filename, so we batch .flat_map { |ids| DesignManagement::Design.by_issue_id_and_filename(ids) } end - - def enabled? - Feature.enabled?(FEATURE_FLAG, parent, default_enabled: true) - end end end end diff --git a/lib/banzai/reference_parser.rb b/lib/banzai/reference_parser.rb index c08d3364a87..8b5d689a984 100644 --- a/lib/banzai/reference_parser.rb +++ b/lib/banzai/reference_parser.rb @@ -2,6 +2,8 @@ module Banzai module ReferenceParser + InvalidReferenceType = Class.new(StandardError) + # Returns the reference parser class for the given type # # Example: @@ -11,6 +13,8 @@ module Banzai # This would return the `Banzai::ReferenceParser::IssueParser` class. def self.[](name) const_get("#{name.to_s.camelize}Parser", false) + rescue NameError + raise InvalidReferenceType end end end diff --git a/lib/banzai/reference_parser/mentioned_group_parser.rb b/lib/banzai/reference_parser/mentioned_group_parser.rb index a0892e15df8..75d05ef59f9 100644 --- a/lib/banzai/reference_parser/mentioned_group_parser.rb +++ b/lib/banzai/reference_parser/mentioned_group_parser.rb @@ -16,7 +16,7 @@ module Banzai end def nodes_visible_to_user(user, nodes) - groups = lazy { grouped_objects_for_nodes(nodes, Group, GROUP_ATTR) } + groups = lazy { grouped_objects_for_nodes(nodes, references_relation, GROUP_ATTR) } nodes.select do |node| node.has_attribute?(GROUP_ATTR) && can_read_group_reference?(node, user, groups) diff --git a/lib/banzai/reference_redactor.rb b/lib/banzai/reference_redactor.rb index 936436982e7..81e4fd45966 100644 --- a/lib/banzai/reference_redactor.rb +++ b/lib/banzai/reference_redactor.rb @@ -111,6 +111,7 @@ module Banzai parser = Banzai::ReferenceParser[type].new(context) visible.merge(parser.nodes_visible_to_user(user, nodes)) + rescue Banzai::ReferenceParser::InvalidReferenceType end visible |