summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs/_file.html.haml
diff options
context:
space:
mode:
authorLUKE BENNETT <lbennett@gitlab.com>2018-01-17 00:16:02 +0000
committerLUKE BENNETT <lbennett@gitlab.com>2018-01-17 00:16:02 +0000
commit3cf7681af325ba4865312d959fb4a6cb8fc449db (patch)
tree67f8d430e4c1e11b5f01c5d5c3b5ab3291c97783 /app/views/projects/diffs/_file.html.haml
parent904b1cda82ab7b2c5beb01e589a4607af7f7e519 (diff)
parent09b07d8420e1102ac3fcfef1395f70439dcc6c76 (diff)
downloadgitlab-ce-10-4-stable-with-rc5-and-rc6.tar.gz
Merge branch '10-4-stable-prepare-rc6' into '10-4-stable'10-4-stable-with-rc5-and-rc6
10.4.0-rc6 on rc5 sec release See merge request gitlab/gitlabhq!2310
Diffstat (limited to 'app/views/projects/diffs/_file.html.haml')
-rw-r--r--app/views/projects/diffs/_file.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index adc4dcbed33..0b01e38d23d 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -11,7 +11,7 @@
- unless diff_file.submodule?
- blob = diff_file.blob
.file-actions.hidden-xs
- - if blob.readable_text?
+ - if blob&.readable_text?
= link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: "Toggle comments for this file", disabled: @diff_notes_disabled do
= icon('comment')
\