summaryrefslogtreecommitdiff
path: root/app/models/protected_ref_matcher.rb
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-07 01:14:10 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-07 01:17:38 +0100
commit9db87fce130bdcb4831631c46fbb9d5717472af2 (patch)
tree63ee8dec19816edb6d4a3f71a9c6ce61f0e71779 /app/models/protected_ref_matcher.rb
parent8a5ca1121b090fe813144adf4428e7cb656b65d3 (diff)
downloadgitlab-ce-9db87fce130bdcb4831631c46fbb9d5717472af2.tar.gz
Protected tags changes from backend maintainer review
Diffstat (limited to 'app/models/protected_ref_matcher.rb')
-rw-r--r--app/models/protected_ref_matcher.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/protected_ref_matcher.rb b/app/models/protected_ref_matcher.rb
index 83f44240259..d970f2b01fc 100644
--- a/app/models/protected_ref_matcher.rb
+++ b/app/models/protected_ref_matcher.rb
@@ -4,7 +4,7 @@ class ProtectedRefMatcher
end
# Returns all protected refs that match the given ref name.
- # This realizes all records from the scope built up so far, and does
+ # This checks all records from the scope built up so far, and does
# _not_ return a relation.
#
# This method optionally takes in a list of `protected_refs` to search
@@ -38,6 +38,8 @@ class ProtectedRefMatcher
end
def wildcard_match?(ref_name)
+ return false unless wildcard?
+
wildcard_regex === ref_name
end