diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 12:10:27 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 12:10:27 +0000 |
commit | 3b963d69199b2e4dd0a0c0b64efcf715242a5d8b (patch) | |
tree | 2719bcba9c985f4ee27b43d29deb202eade9a5df /app/models | |
parent | d06c308380072db8cfac10f27fc114f6093ce8b6 (diff) | |
download | gitlab-ce-3b963d69199b2e4dd0a0c0b64efcf715242a5d8b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 07122db36b3..ef17e010ba8 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -214,7 +214,7 @@ class Repository return false if with_slash.empty? prefixes = no_slash.map { |ref| Regexp.escape(ref) }.join('|') - prefix_regex = %r{^#{prefixes}/} + prefix_regex = %r{^(#{prefixes})/} with_slash.any? do |ref| prefix_regex.match?(ref) |