diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 11:13:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 11:13:46 +0000 |
| commit | 981deddfcee1cf01efcf257dad9dae79ab05ca67 (patch) | |
| tree | 3eccf14cda725aa851921e995c51ac2d59a195ae /lib | |
| parent | b155a44ef4c1da6faaa2a8aaadd9dfad879889e0 (diff) | |
| parent | c94dc3de787c301a7d0d0ca62b475d2ecbfa4630 (diff) | |
| download | gitlab-ce-981deddfcee1cf01efcf257dad9dae79ab05ca67.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redcarpet/render/gitlab_html.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb index 42f6316910a..2e18b0592b5 100644 --- 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> |