summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-01 14:12:43 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-01 14:12:43 +0200
commit4c43d846f2c414143a149509961de68b6e341371 (patch)
tree98fdcad0c17fd580430912bda0f953a8667c1091
parentb5654eb4e686793b3562ed5bce31557ce0cc69f8 (diff)
downloadgitlab-ce-fix-500-compare.tar.gz
Fix 500 error on compare pagefix-500-compare
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/helpers/diff_helper.rb2
1 files changed, 1 insertions, 1 deletions
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