Fix 500 error when comparing by tags

2016-02-11 08:52:37 -06:00 · 2016-02-11 08:52:37 -06:00 · e9e01bcd96
parent 9b1dfd3e81
commit e9e01bcd96
1 changed files with 2 additions and 0 deletions
--- 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