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
Léo-Paul Géneau
gitlab-ce
Commits
e981d6cd
Commit
e981d6cd
authored
8 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extended regexes ignore whitespace, so use \s
parent
f5cc3f63
No related merge requests found
Changes
1
Hide 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
# Regex to find a run of deleted lines followed by the same number of added lines
REGEX
=
%r{
# 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
(?<del_ins>
...
...
@@ -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)
(?=
|
\z
)
(?=
\s
|
\z
)
}x
.
freeze
attr_accessor
:old_line
,
:new_line
,
:offset
...
...
This diff is collapsed.
Click to expand it.
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