summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-10 03:58:41 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-10 03:58:41 -0700
commit381638b77f68004dd9b5607eacceb3cee5b2bf3c (patch)
tree3736e17a1d498599653b076f4480778ccb5e90f1
parent10491ce082505e2e0f309ac1460d17c2a6d16fa3 (diff)
parentdb325ef940e7c084d3a9daf0a5efec2b2580004b (diff)
downloadgitlab-ce-381638b77f68004dd9b5607eacceb3cee5b2bf3c.tar.gz
Merge pull request #4510 from Razer6/fix_not_found_lexers
Fix Pygments 500 error if lexer not found by name
-rw-r--r--lib/redcarpet/render/gitlab_html.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb
index 318adbf1894..d9c2d3b626d 100644
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -12,7 +12,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
def block_code(code, language)
options = { options: {encoding: 'utf-8'} }
lexer = Pygments::Lexer.find(language) # language can be an alias
- options.merge!(lexer: lexer.name.downcase) if lexer # downcase is required
+ 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: