summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-27 13:12:58 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-27 13:12:58 +0200
commit78b2fb5de9d96390110f469d057a2081be34a69b (patch)
treec5979da58891523b996597e475ed5a359817973f /lib
parentffee5bb090c3723bb57e6858d32e9c34baba9912 (diff)
downloadgitlab-ce-78b2fb5de9d96390110f469d057a2081be34a69b.tar.gz
Add highlight.js support to markdown, snippets etc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/redcarpet/render/gitlab_html.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb
index 2d1e0aec5e5..b3e8ed2ade5 100644
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -12,10 +12,6 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
end
def block_code(code, language)
- options = { options: {encoding: 'utf-8'} }
- lexer = Pygments::Lexer.find(language) # language can be an alias
- options.merge!(lexer: lexer.aliases[0].downcase) if lexer # downcase is required
-
# New lines are placed to fix an rendering issue
# with code wrapped inside <h1> tag for next case:
#
@@ -25,7 +21,13 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
#
<<-HTML
- <div class="#{h.user_color_scheme_class}">#{Pygments.highlight(code, options)}</div>
+<div class="highlighted-data #{h.user_color_scheme_class}">
+ <div class="highlight">
+ <pre>
+ <code class="#{language}">#{code}</code>
+ </pre>
+ </div>
+</div>
HTML
end