From ba5ba96f2bbc9e55fcf2afd37c2a11310995add8 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 28 Dec 2016 14:01:36 -0600 Subject: prevent 500 error when selecting changes tab for non-existent branch --- app/models/merge_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 926944bc3b3..70005a87f4b 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -221,7 +221,7 @@ class MergeRequest < ActiveRecord::Base # true base commit, so we can't simply have `#diff_base_commit` fall back on # this method. def likely_diff_base_commit - first_commit.parent || first_commit + first_commit.try(:parent) || first_commit end def diff_start_commit -- cgit v1.2.3