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

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>