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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
e981d6cd
Commit
e981d6cd
authored
Jul 12, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extended regexes ignore whitespace, so use \s
parent
f5cc3f63
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/diff/inline_diff.rb
lib/gitlab/diff/inline_diff.rb
+2
-2
No files found.
lib/gitlab/diff/inline_diff.rb
View file @
e981d6cd
...
@@ -4,7 +4,7 @@ module Gitlab
...
@@ -4,7 +4,7 @@ module Gitlab
# Regex to find a run of deleted lines followed by the same number of added lines
# Regex to find a run of deleted lines followed by the same number of added lines
REGEX
=
%r{
REGEX
=
%r{
# Runs start at the beginning of the string (the first line) or after a space (for an unchanged line)
# Runs start at the beginning of the string (the first line) or after a space (for an unchanged line)
(?:
\A
|
)
(?:
\A
|
\s
)
# This matches a number of `-`s followed by the same number of `+`s through recursion
# This matches a number of `-`s followed by the same number of `+`s through recursion
(?<del_ins>
(?<del_ins>
...
@@ -14,7 +14,7 @@ module Gitlab
...
@@ -14,7 +14,7 @@ module Gitlab
)
)
# Runs end at the end of the string (the last line) or before a space (for an unchanged line)
# Runs end at the end of the string (the last line) or before a space (for an unchanged line)
(?=
|
\z
)
(?=
\s
|
\z
)
}x
.
freeze
}x
.
freeze
attr_accessor
:old_line
,
:new_line
,
:offset
attr_accessor
:old_line
,
:new_line
,
:offset
...
...
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