diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-20 19:20:13 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-20 19:20:13 +0100 |
| commit | 0e992a3b4e710f8486a37bfa73ad6981365fceb2 (patch) | |
| tree | 210146bede4529ed861a77cd36b7b9646b9af65c /app/views/projects/diffs/_parallel_view.html.haml | |
| parent | 577f2fb47a7ef57415b78b49d5c746d4e99f6a98 (diff) | |
| download | gitlab-ce-0e992a3b4e710f8486a37bfa73ad6981365fceb2.tar.gz | |
Properly highlight lines around '\ No newline at end of file'
Diffstat (limited to 'app/views/projects/diffs/_parallel_view.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index 986d30d36a8..a15d147ab05 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -8,6 +8,11 @@ - if left[:type] == 'match' = render "projects/diffs/match_line_parallel", { line: left[:text], line_old: left[:number], line_new: right[:number] } + - elsif left[:type] == 'nonewline' + %td.old_line + %td.line_content.parallel.matched= left[:text] + %td.new_line + %td.line_content.parallel.matched= left[:text] - else %td.old_line{id: left[:line_code], class: "#{left[:type]}"} = link_to raw(left[:number]), "##{left[:line_code]}", id: left[:line_code] |