summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-23 16:13:03 +0300
committerMarin Jankovski <marin@gitlab.com>2014-09-23 17:13:41 +0200
commit0396f38773d6163bde3416ea09b1fe452feae6c7 (patch)
tree9abb10c86b7bc40b564f3bd8984a92ec08019fa9
parent8ccae3c38528643bae9372857f0c85ec708c68ba (diff)
downloadgitlab-ce-0396f38773d6163bde3416ea09b1fe452feae6c7.tar.gz
Fix 500 error on diff if file permission changed
-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 f2a8d148cc6..be9389172b7 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -12,7 +12,7 @@
- else
%span= diff_file.new_path
- if diff_file.mode_changed?
- %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
+ %span.file-mode= "#{diff_file.diff.a_mode} → #{diff_file.diff.b_mode}"
.diff-btn-group
- unless params[:view] == 'parallel'