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

Take added or removed file into account.

Browse Source
This commit is contained in:
Marin Jankovski
2014-09-08 09:05:17 +02:00
parent 357bf00921
commit 75b04a17cf
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/commits/_parallel_view.html.haml
+14 -9
View File
@@ -2,24 +2,29 @@
%div.text-file
%table
- side_diff_line(diff, index) do |line, type, line_code, line_new, line_old, raw_line, next_line|
- next if type == 'new'
%tr.line_holder.parallel{ id: line_code, class: "#{type}" }
- if type == "match"
= render "projects/commits/diffs/match_line_parallel", {line: line,
line_old: line_old, line_new: line_new, bottom: false}
- else
%td.old_line
= link_to raw(line_old), "##{line_code}", id: line_code
- if type == 'old'
%td.line_content{class: "parallel noteable_line old #{line_code}", "line_code" => line_code}= raw line
- if diff.new_file
%td.line_content.parallel= " "
- else
%td.line_content.parallel= raw line
= link_to raw(line_old), "##{line_code}", id: line_code
- if type == 'old'
%td.line_content{class: "parallel noteable_line old #{line_code}", "line_code" => line_code}= raw line
- else
%td.line_content.parallel= raw line
%td.new_line{data: {linenumber: line_new}}
= link_to raw(line_new) , "##{line_code}", id: line_code
- if type == 'old'
%td.line_content.parallel{class: "noteable_line new #{line_code}", "line_code" => line_code}= raw next_line
- if diff.deleted_file
%td.line_content.parallel= " "
- else
%td.line_content.parallel= raw line
= link_to raw(line_new) , "##{line_code}", id: line_code
- if type == 'old'
%td.line_content.parallel{class: "noteable_line new #{line_code}", "line_code" => line_code}= raw next_line
- else
%td.line_content.parallel= raw line
- if diff.diff.blank? && diff_file_mode_changed?(diff)
.file-mode-changed