diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-09 22:54:20 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-09 22:54:20 -0700 |
| commit | 2ab782ae37c6a9f3efcd68ac9d486eafe1b23f3d (patch) | |
| tree | 77cf18253882083a2566e3252c956c13c8b24363 | |
| parent | 05bc65895c083cf89e44e72c80918cda761cfaa1 (diff) | |
| parent | 409b0a0ab557dcc146e3123e976a4634f3d05877 (diff) | |
| download | gitlab-ce-2ab782ae37c6a9f3efcd68ac9d486eafe1b23f3d.tar.gz | |
Merge pull request #4260 from dosire/pygments-name
Fix pygment lexer 500 errors when an alias is used instead of a name.
| -rw-r--r-- | lib/redcarpet/render/gitlab_html.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb index 4f2c86e2d41..318adbf1894 100644 --- a/lib/redcarpet/render/gitlab_html.rb +++ b/lib/redcarpet/render/gitlab_html.rb @@ -11,7 +11,8 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML def block_code(code, language) 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 # with code wrapped inside <h1> tag for next case: |