diff options
author | Fabio Papa <fabtheman@gmail.com> | 2019-07-12 17:10:20 +0000 |
---|---|---|
committer | Fabio Papa <fabtheman@gmail.com> | 2019-07-12 17:10:20 +0000 |
commit | 6457d5edb7d66df5dd3d5ba1f1ea0c56a59287a8 (patch) | |
tree | c683e3d7ebcf3e188f1dd85b8701ff972e7f8a3d /app/helpers/markup_helper.rb | |
parent | 9b176c65159e4186f79eae2107af80e69132ba09 (diff) | |
parent | 740288f80d85210ada3eccc0f98e0843b2917d65 (diff) | |
download | gitlab-ce-6457d5edb7d66df5dd3d5ba1f1ea0c56a59287a8.tar.gz |
Merge branch 'master' into 'maintainers-can-create-subgroup'
# Conflicts:
# doc/user/permissions.md
Diffstat (limited to 'app/helpers/markup_helper.rb')
-rw-r--r-- | app/helpers/markup_helper.rb | 12 |
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 |