Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-09-05 11:46:58 +0400
committerMarin Jankovski <marin@gitlab.com>2014-09-08 11:05:17 +0400
commit7d45624daff1ed4a3896c6270a0911a73f6f815f (patch)
tree172971fd72dcc082efbf9e4b1edd93c5a6c0ecf4 /app
parent721b75733c49117100a5caf04bf6040fe6004dca (diff)
Don't show the line numbers if the lines were removed.
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/commits/_parallel_view.html.haml8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/commits/_parallel_view.html.haml b/app/views/projects/commits/_parallel_view.html.haml
index 7debc44e132..1d3aa1bf25a 100644
--- a/app/views/projects/commits/_parallel_view.html.haml
+++ b/app/views/projects/commits/_parallel_view.html.haml
@@ -23,11 +23,15 @@
%td.line_content.parallel= " "
- else
%td.new_line{class: "#{type}", data: {linenumber: line_new}}
- = link_to raw(line_new) , "##{line_code}", id: line_code
- if type == 'old'
- - content = next_type == 'new' ? next_line : "&nbsp;"
+ - if next_type == 'new'
+ - content = next_line
+ = link_to raw(line_new) , "##{line_code}", id: line_code
+ - else
+ - content = "&nbsp;"
%td.line_content.parallel{class: "noteable_line new #{line_code}", "line_code" => line_code}= raw content
- else
+ = link_to raw(line_new) , "##{line_code}", id: line_code
%td.line_content.parallel{class: "#{type}"}= raw line
- if diff.diff.blank? && diff_file_mode_changed?(diff)