Fix inline diff issue. See #3150

8f52501e · Dmitriy Zaporozhets · 5d092945 · 8f52501e · 8f52501e
Commit 8f52501e authored Jun 12, 2013 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

app/controllers/commit_controller.rb app/controllers/commit_controller.rb +1 -1

lib/gitlab/inline_diff.rb lib/gitlab/inline_diff.rb +3 -4

No files found.
--- a/app/controllers/commit_controller.rb
+++ b/app/controllers/commit_controller.rb
--- a/lib/gitlab/inline_diff.rb
+++ b/lib/gitlab/inline_diff.rb
@@ -21,8 +21,9 @@ 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)
+          start = first_token + START
-          diff_arr[index+2].sub!(first_token, first_token + START)
+          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
@@ -60,8 +61,6 @@ module Gitlab
        line.gsub!(FINISH, "</span>")
        line
      end
    end
  end
 end