diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-09-04 15:27:57 +0400 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-09-08 11:05:17 +0400 |
| commit | 75b04a17cf27cd7f7a252a697f347c08d58e2fd4 (patch) | |
| tree | ad6b5c4c2e72806e59fb0729625b77bc9cefdc09 /app | |
| parent | 357bf00921be191fcd401cdf26d9798f2b57a127 (diff) | |
Take added or removed file into account.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/commits/_parallel_view.html.haml | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/views/projects/commits/_parallel_view.html.haml b/app/views/projects/commits/_parallel_view.html.haml index d7792e488a2..f23051f2511 100644 --- a/app/views/projects/commits/_parallel_view.html.haml +++ b/app/views/projects/commits/_parallel_view.html.haml @@ -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 |