summaryrefslogtreecommitdiff
path: root/app/models/repository.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 221d01c5b44..9e01f7f0df5 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -182,15 +182,14 @@ class Repository
tags.find { |tag| tag.name == name }
end
- def resolve_ref(ref)
- tag_exists = tag_exists?(ref)
- branch_exists = branch_exists?(ref)
+ def ambiguous_ref?(ref)
+ tag_exists?(ref) && branch_exists?(ref)
+ end
- if tag_exists && branch_exists
- nil
- elsif tag_exists
+ def resolve_ref(ref)
+ if tag_exists?(ref)
Gitlab::Git::TAG_REF_PREFIX + ref
- elsif branch_exists
+ elsif branch_exists?(ref)
Gitlab::Git::BRANCH_REF_PREFIX + ref
else
ref