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

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

Browse Source 
Fix  random 500 error on compare page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Bug appeared after recent mr !1471  

See merge request !1486
This commit is contained in:
Dmitriy Zaporozhets
2015-10-01 13:53:15 +00:00
parent 96c2e22549 4c43d846f2
commit d330046fc1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/diff_helper.rb
+1 -1
View File
@@ -170,7 +170,7 @@ module DiffHelper
def commit_for_diff(diff)
if diff.deleted_file
@merge_request ? @merge_request.commits.last : @commit.parent_id
@merge_request ? @merge_request.commits.last : @commit.parents.first
else
@commit
end