BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2ab782ae
Commit
2ab782ae
authored
Jun 09, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
gitlab_html.rb
lib/redcarpet/render/gitlab_html.rb
+2
-1
No files found.
lib/redcarpet/render/gitlab_html.rb
View file @
2ab782ae
...
...
@@ -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:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment