deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'diff_bug'

Browse source
This commit is contained in:
Valeriy Sizov 2012-10-04 13:29:27 +03:00
parent d88332709c bd5334abc2
commit 810d0903f8
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/gitlab/inline_diff.rb
View file

@ -21,14 +21,13 @@ module Gitlab
end
end
first_token = first_line[0..first_the_same_symbols][1..-1]
diff_arr[index+1].sub!(first_token, first_token + START)
diff_arr[index+2].sub!(first_token, first_token + START)
last_the_same_symbols = 0
(1..max_length + 1).each do |i|
last_the_same_symbols = -i
if first_line[-i] != second_line[-i]
shortest_line = second_line.size > first_line.size ? first_line : second_line
if ( first_line[-i] != second_line[-i] ) || "#{first_token}#{START}".size == shortest_line[1..-i].size
break
end
end