Merge branch 'rouge-patch' into 'master'
Fix highlighting of deleted lines in diffs. Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498 Only needed until https://github.com/jneen/rouge/pull/297 is merged into Rouge and the gem is updated in GitLab. Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an option, since `gollum-lib` has `rouge` as a dependency, so it would get included anyway, and which code we'd get would depend on the load order. See merge request !1267
This commit is contained in:
commit
a81ce718c7
|
@ -42,6 +42,7 @@ v 8.0.0 (unreleased)
|
|||
- Fix bug which IE cannot show image at markdown when the image is raw file of gitlab
|
||||
- Add support for Crowd
|
||||
- Global Labels that are available to all projects
|
||||
- Fix highlighting of deleted lines in diffs.
|
||||
|
||||
v 7.14.1
|
||||
- Improve abuse reports management from admin area
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
# 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