Commit 8f52501e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix inline diff issue. See #3150

parent 9885ea1e130f
...@@ -11,7 +11,7 @@ def show ...@@ -11,7 +11,7 @@ def show
result = CommitLoadContext.new(project, current_user, params).execute result = CommitLoadContext.new(project, current_user, params).execute
@commit = result[:commit] @commit = result[:commit]
if @commit.nil? if @commit.nil?
git_not_found! git_not_found!
return return
......
...@@ -21,8 +21,9 @@ def processing diff_arr ...@@ -21,8 +21,9 @@ def processing diff_arr
end end
end end
first_token = first_line[0..first_the_same_symbols][1..-1] 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 last_the_same_symbols = 0
(1..max_length + 1).each do |i| (1..max_length + 1).each do |i|
last_the_same_symbols = -i last_the_same_symbols = -i
...@@ -60,8 +61,6 @@ def replace_markers line ...@@ -60,8 +61,6 @@ def replace_markers line
line.gsub!(FINISH, "</span>") line.gsub!(FINISH, "</span>")
line line
end end
end end
end end
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment