home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix 500 when viewing diff if a file changed permission

Fixes #1613

See merge request !1109
This commit is contained in:
Marin Jankovski
2014-09-23 15:13:04 +00:00
parent 80b58184d3 b897cc63a5
commit 2bb7a5bbea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/diffs/_file.html.haml
+1 -1
View File
@@ -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'