Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
db325ef9
Commit
db325ef9
authored
Jul 07, 2013
by
Robert Schilling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451
parent
c04e9733
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/redcarpet/render/gitlab_html.rb
lib/redcarpet/render/gitlab_html.rb
+1
-1
No files found.
lib/redcarpet/render/gitlab_html.rb
View file @
db325ef9
...
@@ -12,7 +12,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
...
@@ -12,7 +12,7 @@ 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'
}
}
lexer
=
Pygments
::
Lexer
.
find
(
language
)
# language can be an alias
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
# 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:
...
...
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