Merge branch 'osw-remote-multi-line-suggestions-ff' into 'master'

Remove multi-line suggestions feature flag

Closes #59178

See merge request gitlab-org/gitlab-ce!27219

1 files changed, 0 insertions, 12 deletions

diff --git a/lib/banzai/filter/suggestion_filter.rb b/lib/banzai/filter/suggestion_filter.rb
index 848aca10a20..3d40abfc540 100644
--- a/lib/banzai/filter/suggestion_filter.rb
+++ b/lib/banzai/filter/suggestion_filter.rb
@@ -6,15 +6,11 @@ module Banzai
     class SuggestionFilter < HTML::Pipeline::Filter
       # Class used for tagging elements that should be rendered
       TAG_CLASS = 'js-render-suggestion'.freeze
-      SUGGESTION_REGEX = Gitlab::Diff::SuggestionsParser::SUGGESTION_CONTEXT
 
       def call
         return doc unless suggestions_filter_enabled?
 
         doc.search('pre.suggestion > code').each do |node|
-          # TODO: Remove once multi-line suggestions FF get removed (#59178).
-          remove_multi_line_params(node.parent)
-
           node.add_class(TAG_CLASS)
         end
 
@@ -30,14 +26,6 @@ module Banzai
       def project
         context[:project]
       end
-
-      def remove_multi_line_params(node)
-        return if Feature.enabled?(:multi_line_suggestions, project)
-
-        if node[SyntaxHighlightFilter::LANG_PARAMS_ATTR]&.match?(SUGGESTION_REGEX)
-          node.remove_attribute(SyntaxHighlightFilter::LANG_PARAMS_ATTR)
-        end
-      end
     end
   end
 end