root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Properly highlight right side of parallel diff

This commit is contained in:
Douwe Maan 2016-01-22 02:12:43 +01:00
parent 16d17b78ca
commit 3db24ec9e8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gitlab/diff/parallel_diff.rb
View File

@ -11,7 +11,8 @@ module Gitlab
lines = [] lines = []
skip_next = false skip_next = false
diff_file.highlighted_diff_lines.each do |line| highlighted_diff_lines = diff_file.highlighted_diff_lines
highlighted_diff_lines.each do |line|
full_line = line.text full_line = line.text
type = line.type type = line.type
line_code = generate_line_code(diff_file.file_path, line) line_code = generate_line_code(diff_file.file_path, line)
@ -21,6 +22,7 @@ module Gitlab
next_line = diff_file.next_line(line.index) next_line = diff_file.next_line(line.index)
if next_line if next_line
next_line = highlighted_diff_lines[next_line.index]
next_line_code = generate_line_code(diff_file.file_path, next_line) next_line_code = generate_line_code(diff_file.file_path, next_line)
next_type = next_line.type next_type = next_line.type
next_line = next_line.text next_line = next_line.text