BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 2ab782ae by Dmitriy Zaporozhets
Options

Merge pull request #4260 from dosire/pygments-name

Fix pygment lexer 500 errors when an alias is used instead of a name.
parents 05bc6589 409b0a0a
Showing with 2 additions and 1 deletion
lib/redcarpet/render/gitlab_html.rb
...@@ -11,7 +11,8 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML ...@@ -11,7 +11,8 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
def block_code(code, language) def block_code(code, language)
options = { options: {encoding: 'utf-8'} } options = { options: {encoding: 'utf-8'} }
options.merge!(lexer: language.downcase) if Pygments::Lexer.find(language) lexer = Pygments::Lexer.find(language) # language can be an alias
options.merge!(lexer: lexer.name.downcase) if lexer # downcase is required
# New lines are placed to fix an rendering issue # New lines are placed to fix an rendering issue
# with code wrapped inside <h1> tag for next case: # with code wrapped inside <h1> tag for next case:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment