diff options
| author | Mark Riedesel <mark@klowner.com> | 2016-02-11 08:52:37 -0600 |
|---|---|---|
| committer | Mark Riedesel <mark@klowner.com> | 2016-02-11 09:01:52 -0600 |
| commit | 203e4378b4e3d45553212e6240e646b1a2afe617 (patch) | |
| tree | eba177c266b13085370190d9eea8317a0327aacb | |
| parent | 9b1dfd3e81855c99b0ccb703d3aecc3f1a7ac7c9 (diff) | |
| download | gitlab-ce-klowner/gitlab-ce-fix-compare-by-tag-crash.tar.gz | |
Fix 500 error when comparing by tags, issue 13171klowner/gitlab-ce-fix-compare-by-tag-crash
| -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..5d12986812a 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).id + second_commit_id = commit(second_commit_id).id rugged.merge_base(first_commit_id, second_commit_id) rescue Rugged::ReferenceError nil |