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

Color the lines correctly.

Browse Source
This commit is contained in:
Marin Jankovski
2014-09-08 09:05:17 +02:00
parent 7d45624daf
commit 13cfa49a3d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/commits/_parallel_view.html.haml
+10 -8
View File
@@ -8,8 +8,8 @@
line_old: line_old, line_new: line_new, bottom: false}
- else
- if diff.new_file
%td.old_line{ class: "old" }
%td.line_content.parallel= " "
%td.old_line
%td.line_content.parallel= raw " "
- else
- next if type == 'new'
%td.old_line{ class: "#{type}" }
@@ -19,18 +19,20 @@
- else
%td.line_content.parallel= raw line
- if diff.deleted_file
%td.new_line{class: "new", data: {linenumber: line_new}}
%td.line_content.parallel= " "
%td.new_line{ data: {linenumber: line_new}}
%td.line_content.parallel= raw " "
- else
%td.new_line{class: "#{type}", data: {linenumber: line_new}}
- if type == 'old'
- if type == 'old'
%td.new_line{class: "#{next_type == 'new' ? 'new' : nil}", data: {linenumber: line_new}}
- if next_type == 'new'
- content = next_line
= link_to raw(line_new) , "##{line_code}", id: line_code
%td.line_content.parallel{class: "noteable_line new #{line_code}", "line_code" => line_code}= raw content
- else
- content = " "
%td.line_content.parallel{class: "noteable_line new #{line_code}", "line_code" => line_code}= raw content
- else
%td.line_content.parallel{class: "noteable_line #{line_code}", "line_code" => line_code}= raw content
- else
%td.new_line{class: "#{type}", data: {linenumber: line_new}}
= link_to raw(line_new) , "##{line_code}", id: line_code
%td.line_content.parallel{class: "#{type}"}= raw line