Merge branch 'fix_simple_format_undefined' into 'master'

Fix `simple_format` undefined error #60179

Closes #60179

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

1 files changed, 8 insertions, 4 deletions

diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb
index 8ccb39f8444..d76a0f3a3b8 100644
--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -3,7 +3,7 @@
 require 'nokogiri'
 
 module MarkupHelper
-  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::TextHelper
   include ::Gitlab::ActionViewOutput::Context
 
   def plain?(filename)
@@ -154,9 +154,7 @@ module MarkupHelper
     elsif asciidoc?(file_name)
       asciidoc_unsafe(text, context)
     elsif plain?(file_name)
-      content_tag :pre, class: 'plain-readme' do
-        text
-      end
+      plain_unsafe(text)
     else
       other_markup_unsafe(file_name, text, context)
     end
@@ -271,6 +269,12 @@ module MarkupHelper
     Gitlab::Asciidoc.render(text, context)
   end
 
+  def plain_unsafe(text)
+    content_tag :pre, class: 'plain-readme' do
+      text
+    end
+  end
+
   def other_markup_unsafe(file_name, text, context = {})
     Gitlab::OtherMarkup.render(file_name, text, context)
   end