summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs/viewers/_text.html.haml
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-06-08 10:15:27 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2017-06-08 10:15:27 -0500
commitb55bd9ef95734a6805b11a8a8322149e885425a6 (patch)
tree769f52169d7ad85d68aea3218c7e9116f9269b25 /app/views/projects/diffs/viewers/_text.html.haml
parentc24b70682448f23d7eb01853026cfe6abdf86190 (diff)
parentb4972c4b237ad270ad1a4054c2fe2439d60ee06d (diff)
downloadgitlab-ce-b55bd9ef95734a6805b11a8a8322149e885425a6.tar.gz
Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui
Diffstat (limited to 'app/views/projects/diffs/viewers/_text.html.haml')
-rw-r--r--app/views/projects/diffs/viewers/_text.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/viewers/_text.html.haml b/app/views/projects/diffs/viewers/_text.html.haml
index e4b89671724..120d3540223 100644
--- a/app/views/projects/diffs/viewers/_text.html.haml
+++ b/app/views/projects/diffs/viewers/_text.html.haml
@@ -1,5 +1,5 @@
- blob = diff_file.blob
-- blob.load_all_data!(diff_file.repository)
+- blob.load_all_data!
- total_lines = blob.lines.size
- total_lines -= 1 if total_lines > 0 && blob.lines.last.blank?
- if diff_view == :parallel