Merge branch '6-6-4-patch' into '6-6-stable'

6-6-4 Patch

Merge branch '6-6-4-patch' into '6-6-stable'
6-6-4 Patch
Dmitriy Zaporozhets
2 parents 7a21e469 51257280
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
lib/redcarpet/render/gitlab_html.rb
@@ -24,7 +24,7 @@ class Redcarpet::Render::GitlabHTML &lt; 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>
	@@ -24,7 +24,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML		@@ -24,7 +24,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
24		24
25	<div class="highlighted-data #{h.user_color_scheme_class}">	25	<div class="highlighted-data #{h.user_color_scheme_class}">
26	<div class="highlight">	26	<div class="highlight">
27	- <pre><code class="#{language}">#{code}</code></pre>	27	+ <pre><code class="#{language}">#{h.send(:html_escape, code)}</code></pre>
28	</div>	28	</div>
29	</div>	29	</div>
30		30