diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:05:44 +0100 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:05:44 +0100 |
commit | 2b0e8b86d8aa35ac094d18bfefaa81af916347fa (patch) | |
tree | a0469ccf9e179832b2231c7f2abfa23956a4048f /app/views/projects/diffs/_parallel_view.html.haml | |
parent | 444d71e043eb19979ec1b08504b2760910cb2a47 (diff) | |
parent | c89449e6110c2bdf6e1410bae3e7b7d807c5e305 (diff) | |
download | gitlab-ce-2b0e8b86d8aa35ac094d18bfefaa81af916347fa.tar.gz |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'app/views/projects/diffs/_parallel_view.html.haml')
-rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index 074f1f634ae..997bf0fc560 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -43,7 +43,8 @@ - discussion_left, discussion_right = parallel_diff_discussions(left, right, diff_file) - if discussion_left || discussion_right = render "discussions/parallel_diff_discussion", discussion_left: discussion_left, discussion_right: discussion_right - - if !diff_file.new_file && diff_file.diff_lines.any? + - if !diff_file.new_file && !diff_file.deleted_file && diff_file.diff_lines.any? - last_line = diff_file.diff_lines.last - %tr.line_holder.parallel - = diff_match_line last_line.old_pos, last_line.new_pos, bottom: true, view: :parallel + - if last_line.new_pos < total_lines + %tr.line_holder.parallel + = diff_match_line last_line.old_pos, last_line.new_pos, bottom: true, view: :parallel |