diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 14:36:44 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 14:36:44 +0000 |
| commit | 2945ba36e2d89f2df655b762b7784e01979ed882 (patch) | |
| tree | 00255a74320f13b9b8a8996b682e79a2a7b08f7c | |
| parent | 7a21e469160c6464e3b76c3b6682c69c6374b767 (diff) | |
| parent | 51257280ce03eb3460eef845aef17d961b14001a (diff) | |
| download | gitlab-ce-2945ba36e2d89f2df655b762b7784e01979ed882.tar.gz | |
Merge branch '6-6-4-patch' into '6-6-stable'
6-6-4 Patch
| -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> |