From bd5334abc28ddc17b18df25cfe2fee1240d132a6 Mon Sep 17 00:00:00 2001 From: Valeriy Sizov Date: Thu, 4 Oct 2012 13:28:58 +0300 Subject: [PATCH] fix inline diff --- lib/gitlab/inline_diff.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/gitlab/inline_diff.rb b/lib/gitlab/inline_diff.rb index 0f289a61..7a0a3214 100644 --- a/lib/gitlab/inline_diff.rb +++ b/lib/gitlab/inline_diff.rb @@ -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