From e981d6cd0d6b8ae7d2911a57a65751deaa9ec555 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 12 Jul 2016 11:25:39 -0500
Subject: [PATCH] Extended regexes ignore whitespace, so use \s
---
lib/gitlab/diff/inline_diff.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/gitlab/diff/inline_diff.rb b/lib/gitlab/diff/inline_diff.rb
index 72d9abeefcc..4a3eb92b9fc 100644
--- a/lib/gitlab/diff/inline_diff.rb
+++ b/lib/gitlab/diff/inline_diff.rb
@@ -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
--
GitLab