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
e20529ce
Commit
e20529ce
authored
Sep 10, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump rouge to 1.10.1
parent
3223a2a5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
27 deletions
+3
-27
CHANGELOG
CHANGELOG
+1
-1
Gemfile.lock
Gemfile.lock
+2
-2
config/initializers/rouge_diff_lexer.rb
config/initializers/rouge_diff_lexer.rb
+0
-24
No files found.
CHANGELOG
View file @
e20529ce
Please view this file on the master branch, on stable branches it's out of date.
v 8.0.0 (unreleased)
- Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
- Bump rouge to 1.10
.1
to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
- Gracefully handle errors in syntax highlighting by leaving the block unformatted (Stan Hu)
- Fix URL construction for merge requests, issues, notes, and commits for relative URL config (Stan Hu)
- Fix emoji URLs in Markdown when relative_url_root is used (Stan Hu)
...
...
Gemfile.lock
View file @
e20529ce
...
...
@@ -291,7 +291,7 @@ GEM
github-markup (~> 1.3.1)
gollum-grit_adapter (~> 0.1, >= 0.1.1)
nokogiri (~> 1.6.4)
rouge (~> 1.10)
rouge (~> 1.10
.1
)
sanitize (~> 2.1.0)
stringex (~> 2.5.1)
gon (5.0.1)
...
...
@@ -544,7 +544,7 @@ GEM
netrc (~> 0.7)
rinku (1.7.3)
rotp (1.6.1)
rouge (1.10.
0
)
rouge (1.10.
1
)
rqrcode (0.4.2)
rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2)
...
...
config/initializers/rouge_diff_lexer.rb
deleted
100644 → 0
View file @
3223a2a5
# Here until https://github.com/jneen/rouge/pull/297 is merged into Rouge and the gem is updated in GitLab.
module
Rouge
module
Lexers
class
Diff
def
self
.
analyze_text
(
text
)
return
1
if
text
.
start_with?
(
'Index: '
)
return
1
if
text
.
start_with?
(
'diff '
)
return
0.9
if
text
.
start_with?
(
'--- '
)
end
state
:root
do
rule
(
/^ .*\n/
,
Text
)
rule
(
/^---\n/
,
Text
)
rule
(
/^\+.*\n/
,
Generic
::
Inserted
)
rule
(
/^-+.*\n/
,
Generic
::
Deleted
)
rule
(
/^!.*\n/
,
Generic
::
Strong
)
rule
(
/^@.*\n/
,
Generic
::
Subheading
)
rule
(
/^([Ii]ndex|diff).*\n/
,
Generic
::
Heading
)
rule
(
/^=.*\n/
,
Generic
::
Heading
)
rule
(
/.*\n/
,
Text
)
end
end
end
end
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