diff --git a/config/feature_flags/development/optimize_merge_request_parser.yml b/config/feature_flags/development/optimize_merge_request_parser.yml deleted file mode 100644 index 9e65f5412c445631c8e297d6f874cec5886ba05f..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/optimize_merge_request_parser.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: optimize_merge_request_parser -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62490/ -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331893 -milestone: '14.0' -type: development -group: group::source code -default_enabled: false diff --git a/lib/banzai/reference_parser/merge_request_parser.rb b/lib/banzai/reference_parser/merge_request_parser.rb index 1664fa1f9ff75d9e98c5f92559b5e1791fccaaa4..3e28f06b7831965d54b73ba46bbd3fae8c82a6f2 100644 --- a/lib/banzai/reference_parser/merge_request_parser.rb +++ b/lib/banzai/reference_parser/merge_request_parser.rb @@ -8,8 +8,6 @@ class MergeRequestParser < IssuableParser self.reference_type = :merge_request def nodes_visible_to_user(user, nodes) - return super if Feature.disabled?(:optimize_merge_request_parser, user, default_enabled: :yaml) - merge_request_nodes = nodes.select { |node| node.has_attribute?(self.class.data_attribute) } records = projects_for_nodes(merge_request_nodes) diff --git a/spec/lib/banzai/reference_parser/merge_request_parser_spec.rb b/spec/lib/banzai/reference_parser/merge_request_parser_spec.rb index 04c35c8b0829d702099eb8835522a555c0131bac..3fbda7f32398cc632f2504ac50824e4e2f6643c2 100644 --- a/spec/lib/banzai/reference_parser/merge_request_parser_spec.rb +++ b/spec/lib/banzai/reference_parser/merge_request_parser_spec.rb @@ -23,14 +23,6 @@ end it_behaves_like "referenced feature visibility", "merge_requests" - - context 'when optimize_merge_request_parser feature flag is off' do - before do - stub_feature_flags(optimize_merge_request_parser: false) - end - - it_behaves_like "referenced feature visibility", "merge_requests" - end end end