diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-05 23:34:53 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-05 23:34:53 +0300 |
| commit | 32b1ceb03677a7484bf10412fbe67ad94b57d51c (patch) | |
| tree | cde572b629a34642f9dbb05057fd5e879205d94f /app/models | |
| parent | 4a1a06f4c6a9fe21504258ac3c1b007853bfd98b (diff) | |
| parent | 6e7e5052374d67c0b3ed6cac3f62a29778d10858 (diff) | |
Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available' into 'master'
Resolve "Merge request tabs don't render when no commits available"
Closes #26155 and #24556
See merge request !8347
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |