diff options
| author | Mark Riedesel <mark@klowner.com> | 2016-02-11 08:52:37 -0600 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-17 12:56:53 +0100 |
| commit | e9e01bcd960868db39e616c2a254d493097d712f (patch) | |
| tree | 2fe00f791001cbf1a8bcdb993defbeaf177b0e4f | |
| parent | 9b1dfd3e81855c99b0ccb703d3aecc3f1a7ac7c9 (diff) | |
| download | gitlab-ce-e9e01bcd960868db39e616c2a254d493097d712f.tar.gz | |
Fix 500 error when comparing by tags
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 7f0047a002e..a5787a05277 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -611,6 +611,8 @@ class Repository end def merge_base(first_commit_id, second_commit_id) + first_commit_id = commit(first_commit_id).try(:id) || first_commit_id + second_commit_id = commit(second_commit_id).try(:id) || second_commit_id rugged.merge_base(first_commit_id, second_commit_id) rescue Rugged::ReferenceError nil |