diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-09-23 15:13:04 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-09-23 15:13:04 +0000 |
| commit | 2bb7a5bbeab6235661bf6b4c3f352f91151d1927 (patch) | |
| tree | 07ad7c8d145319e979253174919c70ac7cf304ed | |
| parent | 80b58184d395bd4e425df122ce401e63535cb7ee (diff) | |
| parent | b897cc63a51d1199109ff9b1d2f8f665bd098a30 (diff) | |
| download | gitlab-ce-2bb7a5bbeab6235661bf6b4c3f352f91151d1927.tar.gz | |
Merge branch 'fix-diff-500' into 'master'
Fix 500 when viewing diff if a file changed permission
Fixes #1613
See merge request !1109
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 2 |
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' |