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

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

Merge branch 'fix-500-compare' into 'master'
d330046f · Dmitriy Zaporozhets · 96c2e225 · 4c43d846 · d330046f
Commit d330046f authored Oct 01, 2015 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

diff_helper.rb app/helpers/diff_helper.rb +1 -1

No files found.
--- 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