Fix 500 error when comparing by tags

e9e01bcd · Mark Riedesel · Rémy Coutable · 9b1dfd3e · e9e01bcd
Commit e9e01bcd authored Feb 11, 2016 by Mark Riedesel Committed by Rémy Coutable Feb 17, 2016
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

app/models/repository.rb app/models/repository.rb +2 -0

No files found.
--- 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