Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/markup/rendering_service.rb')
-rw-r--r--app/services/markup/rendering_service.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/markup/rendering_service.rb b/app/services/markup/rendering_service.rb
index 0142d600522..c4abbb6b5b0 100644
--- a/app/services/markup/rendering_service.rb
+++ b/app/services/markup/rendering_service.rb
@@ -2,8 +2,6 @@
module Markup
class RenderingService
- include ActionView::Helpers::TextHelper
-
# Let's increase the render timeout
# For a smaller one, a test that renders the blob content statically fails
# We can consider removing this custom timeout when markup_rendering_timeout FF is removed:
@@ -51,7 +49,7 @@ module Markup
rescue StandardError => e
Gitlab::ErrorTracking.track_exception(e, project_id: context[:project]&.id, file_name: file_name)
- simple_format(text)
+ ActionController::Base.helpers.simple_format(text)
end
def markdown_unsafe
@@ -63,7 +61,9 @@ module Markup
end
def plain_unsafe
- "<pre class=\"plain-readme\">#{text}</pre>"
+ ActionController::Base.helpers.content_tag :pre, class: 'plain-readme' do
+ text
+ end
end
def other_markup_unsafe