Commit 981deddf authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'highlight_html_escape' into 'master'

Enable html_escape for code blocks highlighted in markdown

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
parents b155a44e c94dc3de
...@@ -24,7 +24,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML ...@@ -24,7 +24,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
<div class="highlighted-data #{h.user_color_scheme_class}"> <div class="highlighted-data #{h.user_color_scheme_class}">
<div class="highlight"> <div class="highlight">
<pre><code class="#{language}">#{code}</code></pre> <pre><code class="#{language}">#{h.send(:html_escape, code)}</code></pre>
</div> </div>
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment