kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix inline diff issue. See #3150

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-06-12 16:43:58 +03:00
parent 5d0929458c
commit 8f52501eb5
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/commit_controller.rb
View file

@ -11,7 +11,7 @@ class CommitController < ProjectResourceController
result = CommitLoadContext.new(project, current_user, params).execute
@commit = result[:commit]
if @commit.nil?
git_not_found!
return

7
lib/gitlab/inline_diff.rb
View file

@ -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