2012-12-02 20:53:50 +01:00
|
|
|
- diff = note.diff
|
|
|
|
.diff_file_header
|
|
|
|
- if diff.deleted_file
|
2012-12-02 20:43:39 +01:00
|
|
|
%span= diff.old_path
|
2012-12-02 20:53:50 +01:00
|
|
|
- else
|
2012-12-02 20:43:39 +01:00
|
|
|
%span= diff.new_path
|
|
|
|
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
|
|
|
|
%span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
|
2012-12-02 20:53:50 +01:00
|
|
|
%br/
|
|
|
|
.diff_file_content
|
|
|
|
%table
|
|
|
|
- each_diff_line(diff.diff.lines.to_a, note.diff_file_index) do |line, type, line_code, line_new, line_old|
|
|
|
|
%tr.line_holder{ id: line_code }
|
|
|
|
- if type == "match"
|
|
|
|
%td.old_line= "..."
|
|
|
|
%td.new_line= "..."
|
|
|
|
%td.line_content.matched= line
|
|
|
|
- else
|
|
|
|
%td.old_line= raw(type == "new" ? " " : line_old)
|
|
|
|
%td.new_line= raw(type == "old" ? " " : line_new)
|
|
|
|
%td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} "
|
|
|
|
|
|
|
|
- if line_code == note.line_code
|
2012-11-17 20:24:12 +01:00
|
|
|
= render "notes/diff_notes_with_reply", notes: discussion_notes
|
2012-12-02 20:53:50 +01:00
|
|
|
- break # cut off diff after notes
|