diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-25 14:22:29 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-02-16 15:40:57 -0600 |
| commit | 3b67af697ce246d1938c571090342c9aa0d9c247 (patch) | |
| tree | 90e050b7eb0f61dbcbc08feea6d97a0a42f25ca7 /app/views/projects/diffs | |
| parent | c89d9e741ce793245427b2b21d58f9df75fe10cd (diff) | |
| download | gitlab-ce-3b67af697ce246d1938c571090342c9aa0d9c247.tar.gz | |
fix build failures
Diffstat (limited to 'app/views/projects/diffs')
| -rw-r--r-- | app/views/projects/diffs/_content.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_content.html.haml b/app/views/projects/diffs/_content.html.haml index f805bfdcaa2..5c38b5ad9c0 100644 --- a/app/views/projects/diffs/_content.html.haml +++ b/app/views/projects/diffs/_content.html.haml @@ -15,7 +15,9 @@ %a.click-to-expand Click to expand it. - elsif diff_file.diff_lines.length > 0 - - total_lines = blob.lines.last.chomp == '' ? blob.lines.size - 1 : blob.lines.size + - total_lines = 0 + - if blob.lines.any? + - total_lines = blob.lines.last.chomp == '' ? blob.lines.size - 1 : blob.lines.size - if diff_view == :parallel = render "projects/diffs/parallel_view", diff_file: diff_file, total_lines: total_lines - else |