Merge branch 'fix-diff-500' into 'master'

Fix 500 when viewing diff if a file changed permission Fixes #1613 See merge request !1109

Merge branch 'fix-diff-500' into 'master'
2bb7a5bb · Marin Jankovski · 80b58184 · b897cc63 · 2bb7a5bb
Commit 2bb7a5bb authored Sep 23, 2014 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_file.html.haml app/views/projects/diffs/_file.html.haml +1 -1

No files found.
--- 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'