Merge branch 'fix-rouge-warning-noise' into 'master'
Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs rouge warnings begone! Closes #2128 Closes #2433 See merge request !1277
This commit is contained in:
commit
7904a751f4
|
@ -1,6 +1,7 @@
|
||||||
Please view this file on the master branch, on stable branches it's out of date.
|
Please view this file on the master branch, on stable branches it's out of date.
|
||||||
|
|
||||||
v 8.0.0 (unreleased)
|
v 8.0.0 (unreleased)
|
||||||
|
- 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)
|
- 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 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)
|
- Fix emoji URLs in Markdown when relative_url_root is used (Stan Hu)
|
||||||
|
|
|
@ -291,7 +291,7 @@ GEM
|
||||||
github-markup (~> 1.3.1)
|
github-markup (~> 1.3.1)
|
||||||
gollum-grit_adapter (~> 0.1, >= 0.1.1)
|
gollum-grit_adapter (~> 0.1, >= 0.1.1)
|
||||||
nokogiri (~> 1.6.4)
|
nokogiri (~> 1.6.4)
|
||||||
rouge (~> 1.9)
|
rouge (~> 1.10.1)
|
||||||
sanitize (~> 2.1.0)
|
sanitize (~> 2.1.0)
|
||||||
stringex (~> 2.5.1)
|
stringex (~> 2.5.1)
|
||||||
gon (5.0.1)
|
gon (5.0.1)
|
||||||
|
@ -544,7 +544,7 @@ GEM
|
||||||
netrc (~> 0.7)
|
netrc (~> 0.7)
|
||||||
rinku (1.7.3)
|
rinku (1.7.3)
|
||||||
rotp (1.6.1)
|
rotp (1.6.1)
|
||||||
rouge (1.9.1)
|
rouge (1.10.1)
|
||||||
rqrcode (0.4.2)
|
rqrcode (0.4.2)
|
||||||
rqrcode-rails3 (0.1.7)
|
rqrcode-rails3 (0.1.7)
|
||||||
rqrcode (>= 0.4.2)
|
rqrcode (>= 0.4.2)
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
# 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
|
|
Loading…
Reference in New Issue