summaryrefslogtreecommitdiff
path: root/app/helpers/markup_helper.rb
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2017-04-24 12:27:58 +0200
committerToon Claes <toon@gitlab.com>2017-04-27 13:22:17 +0200
commitaf114f1280adc19b2b017eef85a980c1ae079101 (patch)
treec2ce8e4470d20aa6e139d5139d003d7d8e2d867b /app/helpers/markup_helper.rb
parented6ed251afc67f743dbe7b0d22ce76713696fa13 (diff)
downloadgitlab-ce-af114f1280adc19b2b017eef85a980c1ae079101.tar.gz
`markdown` helper is not used with pre-rendered content
Diffstat (limited to 'app/helpers/markup_helper.rb')
-rw-r--r--app/helpers/markup_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb
index bad949d7a22..3b08b0447b2 100644
--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -73,7 +73,7 @@ module MarkupHelper
return '' unless text.present?
context[:project] ||= @project
- html = context.delete(:rendered) || markdown_unsafe(text, context)
+ html = markdown_unsafe(text, context)
banzai_postprocess(html, context)
end