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
e08ff468
Commit
e08ff468
authored
Jun 21, 2016
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make #custom_language private
parent
c8b52761
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
lib/gitlab/highlight.rb
lib/gitlab/highlight.rb
+8
-8
No files found.
lib/gitlab/highlight.rb
View file @
e08ff468
...
@@ -27,14 +27,6 @@ module Gitlab
...
@@ -27,14 +27,6 @@ module Gitlab
end
end
end
end
def
custom_language
return
nil
if
@repository
.
nil?
language_name
=
@repository
.
gitattribute
(
@blob_name
,
'gitlab-language'
)
Rouge
::
Lexer
.
find
(
language_name
)
end
def
highlight
(
text
,
continue:
true
,
plain:
false
)
def
highlight
(
text
,
continue:
true
,
plain:
false
)
if
plain
if
plain
@formatter
.
format
(
Rouge
::
Lexers
::
PlainText
.
lex
(
text
)).
html_safe
@formatter
.
format
(
Rouge
::
Lexers
::
PlainText
.
lex
(
text
)).
html_safe
...
@@ -47,6 +39,14 @@ module Gitlab
...
@@ -47,6 +39,14 @@ module Gitlab
private
private
def
custom_language
return
nil
if
@repository
.
nil?
language_name
=
@repository
.
gitattribute
(
@blob_name
,
'gitlab-language'
)
Rouge
::
Lexer
.
find
(
language_name
)
end
def
rouge_formatter
(
options
=
{})
def
rouge_formatter
(
options
=
{})
options
=
options
.
reverse_merge
(
options
=
options
.
reverse_merge
(
nowrap:
true
,
nowrap:
true
,
...
...
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