diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-02-16 15:38:10 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-02-16 15:41:04 -0600 |
| commit | 2d0c0308d55fffd18e7b04c0d038ff5a8f194c56 (patch) | |
| tree | 2054dac99de7228c50bf99d5106d7fb4fc56083b /app/views/projects/diffs/_parallel_view.html.haml | |
| parent | 3b67af697ce246d1938c571090342c9aa0d9c247 (diff) | |
| download | gitlab-ce-2d0c0308d55fffd18e7b04c0d038ff5a8f194c56.tar.gz | |
prevent diff unfolding link from appearing for deleted files
Diffstat (limited to 'app/views/projects/diffs/_parallel_view.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index 7240b4945df..997bf0fc560 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -43,7 +43,7 @@ - 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 - if last_line.new_pos < total_lines %tr.line_holder.parallel |