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

Merge branch 'highlight_html_escape' into 'master'
981deddf · Dmitriy Zaporozhets · b155a44e · c94dc3de · 981deddf
Commit 981deddf authored Feb 27, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gitlab_html.rb lib/redcarpet/render/gitlab_html.rb +1 -1

No files found.
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -24,7 +24,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML

 <div class="highlighted-data #{h.user_color_scheme_class}">
  <div class="highlight">
-    <pre><code class="#{language}">#{code}</code></pre>
+    <pre><code class="#{language}">#{h.send(:html_escape, code)}</code></pre>
  </div>
 </div>