diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-09-08 11:04:56 +0400 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-09-08 11:05:17 +0400 |
| commit | 205358b1ae71611a04e03789b3bac74bd1052da5 (patch) | |
| tree | 3aae468907ee9cb967039584223fe18b39922f59 /app | |
| parent | 23706716fcf57da7ba572a8720c753c75f554b05 (diff) | |
Cleanup
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/commits/_parallel_view.html.haml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/app/views/projects/commits/_parallel_view.html.haml b/app/views/projects/commits/_parallel_view.html.haml index f455bec1d8e..dec417bb21f 100644 --- a/app/views/projects/commits/_parallel_view.html.haml +++ b/app/views/projects/commits/_parallel_view.html.haml @@ -11,20 +11,13 @@ %tr.line_holder.parallel - if type_left == 'match' - = render "projects/commits/diffs/match_line_parallel", {line: line_content_left, - line_old: line_number_left, line_new: line_number_right, bottom: false} - - elsif type_left == 'old' - %td.old_line{ class: "old" } + = render "projects/commits/diffs/match_line_parallel", { line: line_content_left, + line_old: line_number_left, line_new: line_number_right } + - elsif type_left == 'old' || type_left.nil? + %td.old_line{class: "#{type_left}"} = link_to raw(line_number_left) - %td.line_content{class: "parallel noteable_line old"}= raw line_content_left - %td.new_line{class: "#{type_right == 'new' ? 'new' : nil}", data: {linenumber: line_number_right}} - = link_to raw(line_number_right) - %td.line_content.parallel{class: "noteable_line #{type_right == 'new' ? 'new' : nil}"}= raw line_content_right - - elsif type_left.nil? - %td.old_line - = link_to raw(line_number_left) - %td.line_content{class: "parallel noteable_line"}= raw line_content_left - %td.new_line{class: "#{type_right == 'new' ? 'new' : nil}", data: {linenumber: line_number_right}} + %td.line_content{class: "parallel noteable_line #{type_left}" }= raw line_content_left + %td.new_line{ class: "#{type_right == 'new' ? 'new' : nil}", data: { linenumber: line_number_right }} = link_to raw(line_number_right) %td.line_content.parallel{class: "noteable_line #{type_right == 'new' ? 'new' : nil}"}= raw line_content_right |