Use Gitlab::Git::Ref in Project#resolve_ref

Reworks Project#resolve_ref to return Gitlab::Git::Branch,
Gitlab::Git::Tag or raise an AmbiguousRef error.

2 files changed, 16 insertions, 5 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 61840c972ee..6893f76dda9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1168,11 +1168,11 @@ class Project < ActiveRecord::Base
     if tag_exists && branch_exists
       raise AmbiguousRef
     elsif tag_exists
-      Gitlab::Git::TAG_REF_PREFIX + ref
+      repository.find_tag(ref)
     elsif branch_exists
-      Gitlab::Git::BRANCH_REF_PREFIX + ref
+      repository.find_branch(ref)
     else
-      ref
+      repository.find_ref(ref)
     end
   end
 
@@ -1753,8 +1753,9 @@ class Project < ActiveRecord::Base
   end
 
   def protected_for?(ref)
-    full_ref = resolve_ref(ref)
-    ref_name = Gitlab::Git.ref_name(full_ref)
+    resolved_ref = resolve_ref(ref)
+    full_ref = resolved_ref.full_ref
+    ref_name = resolved_ref.name
 
     if Gitlab::Git.branch_ref?(full_ref)
       ProtectedBranch.protected?(self, ref_name)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 35dd120856d..10635eb0cf4 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -182,6 +182,16 @@ class Repository
     tags.find { |tag| tag.name == name }
   end
 
+  def find_ref(ref)
+    if Gitlab::Git.tag_ref?(ref)
+      find_tag(Gitlab::Git.ref_name(ref))
+    elsif Gitlab::Git.branch_ref?(ref)
+      find_branch(Gitlab::Git.ref_name(ref))
+    else
+      nil
+    end
+  end
+
   def add_branch(user, branch_name, ref)
     branch = raw_repository.add_branch(branch_name, user: user, target: ref)