summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 2ba273c6f98..800c8afb49f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1737,10 +1737,10 @@ class Project < ActiveRecord::Base
end
def protected_for?(ref)
- resolved_ref = repository.resolve_ref(ref)
- return false unless resolved_ref
+ return false unless ref && !repository.ambiguous_ref?(ref)
- ref_name = Gitlab::Git.ref_name(resolved_ref)
+ resolved_ref = repository.resolve_ref(ref)
+ ref_name = resolved_ref == ref ? Gitlab::Git.ref_name(resolved_ref) : ref
if Gitlab::Git.branch_ref?(resolved_ref)
ProtectedBranch.protected?(self, ref_name)