From 4c43d846f2c414143a149509961de68b6e341371 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 1 Oct 2015 14:12:43 +0200 Subject: [PATCH] Fix 500 error on compare page Signed-off-by: Dmitriy Zaporozhets --- app/helpers/diff_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 9d718e13b85..b896fba3704 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -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