From e9e01bcd960868db39e616c2a254d493097d712f Mon Sep 17 00:00:00 2001 From: Mark Riedesel Date: Thu, 11 Feb 2016 08:52:37 -0600 Subject: [PATCH] Fix 500 error when comparing by tags --- app/models/repository.rb | 2 ++ 1 file changed, 2 insertions(+) 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 -- GitLab