Fix inline diff issue. See #3150

Dmitriy Zaporozhets
1 parent 5d092945
Showing 2 changed files with 4 additions and 5 deletions Show diff stats
app/controllers/commit_controller.rb
lib/gitlab/inline_diff.rb
@@ -11,7 +11,7 @@ class CommitController &lt; ProjectResourceController
     result = CommitLoadContext.new(project, current_user, params).execute
     @commit = result[:commit]
-    
+
     if @commit.nil?
       git_not_found!
       return
@@ -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)
-          diff_arr[index+2].sub!(first_token, first_token + START)
+          start = 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
	@@ -11,7 +11,7 @@ class CommitController < ProjectResourceController		@@ -11,7 +11,7 @@ class CommitController < ProjectResourceController
11	result = CommitLoadContext.new(project, current_user, params).execute	11	result = CommitLoadContext.new(project, current_user, params).execute
12		12
13	@commit = result[:commit]	13	@commit = result[:commit]
14	-	14	+
15	if @commit.nil?	15	if @commit.nil?
16	git_not_found!	16	git_not_found!
17	return	17	return