summaryrefslogtreecommitdiff
path: root/lib/redcarpet
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-10 00:55:56 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-10 00:55:56 +0100
commitca54d43f9900666ff86fb4c647f9f9441eec781a (patch)
tree656ea0b214a441507bbc9d7d6fce69d3b0d4f7ca /lib/redcarpet
parent6cec9ed3283a611a40b6df981ed00ccaa1bd0e73 (diff)
downloadgitlab-ce-ca54d43f9900666ff86fb4c647f9f9441eec781a.tar.gz
Fix 500s because of "missing" lexer
Diffstat (limited to 'lib/redcarpet')
-rw-r--r--lib/redcarpet/render/gitlab_html.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb
index 30a807145ea..48b4da9d339 100644
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -10,10 +10,12 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
end
def block_code(code, language)
+ options = { options: {encoding: 'utf-8'} }
+
if Pygments::Lexer.find(language)
- Pygments.highlight(code, lexer: language, options: {encoding: 'utf-8'})
+ Pygments.highlight(code, options.merge(lexer: language.downcase))
else
- Pygments.highlight(code, options: {encoding: 'utf-8'})
+ Pygments.highlight(code, options)
end
end