home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-diff-comments' into 'master'

Browse Source 
More highlighted diff fixes

See merge request !2545
This commit is contained in:
Robert Speicher
2016-01-21 23:39:54 -08:00
committed by Robert Speicher
parent 13a7808242
commit d6dd80d097
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gitlab/diff/parallel_diff.rb
+3 -1
View File
@@ -11,7 +11,8 @@ module Gitlab
lines = []
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
type = line.type
line_code = generate_line_code(diff_file.file_path, line)
@@ -21,6 +22,7 @@ module Gitlab
next_line = diff_file.next_line(line.index)
if next_line
next_line = highlighted_diff_lines[next_line.index]
next_line_code = generate_line_code(diff_file.file_path, next_line)
next_type = next_line.type
next_line = next_line.text