mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-12 06:06:05 +10:00
39 lines
1.7 KiB
Plaintext
39 lines
1.7 KiB
Plaintext
/ Side-by-side diff view
|
|
- old_lines, new_lines = parallel_diff_lines(project, @commit, diff, file)
|
|
- num_lines = old_lines.length
|
|
|
|
%div.text-file
|
|
%table
|
|
- num_lines.times do |index|
|
|
- new_line = new_lines[index]
|
|
- old_line = old_lines[index]
|
|
%tr.line_holder.parallel
|
|
-# For old line
|
|
- if old_line.type == :file_created
|
|
%td.old_line= old_line.num
|
|
%td.line_content.parallel= "File was created"
|
|
- elsif old_line.type == :deleted
|
|
%td.old_line.old= old_line.num
|
|
%td.line_content{class: "parallel noteable_line old #{old_line.code}", "line_code" => old_line.code}= old_line.content
|
|
- else old_line.type == :no_change
|
|
%td.old_line= old_line.num
|
|
%td.line_content.parallel= old_line.content
|
|
|
|
-# For new line
|
|
- if new_line.type == :file_deleted
|
|
%td.new_line= new_line.num
|
|
%td.line_content.parallel= "File was deleted"
|
|
- elsif new_line.type == :added
|
|
%td.new_line.new= new_line.num
|
|
%td.line_content{class: "parallel noteable_line new #{new_line.code}", "line_code" => new_line.code}= new_line.content
|
|
- else new_line.type == :no_change
|
|
%td.new_line= new_line.num
|
|
%td.line_content.parallel= new_line.content
|
|
|
|
- if @reply_allowed
|
|
- comments1 = @line_notes.select { |n| n.line_code == old_line.code }.sort_by(&:created_at)
|
|
- comments2 = @line_notes.select { |n| n.line_code == new_line.code }.sort_by(&:created_at)
|
|
- unless comments1.empty? and comments2.empty?
|
|
= render "projects/notes/diff_notes_with_reply_parallel", notes1: comments1, notes2: comments2
|
|
|