summaryrefslogtreecommitdiff
path: root/lib/gitlab/regex.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-22 15:06:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-22 15:06:39 +0000
commit68b6846fa6c7b630cc8dab7a8474dcc34e4d67d4 (patch)
treef592f2a5fed915184154ffd05e4e44298a192207 /lib/gitlab/regex.rb
parent4db9eeb44af5644eb1d080b4ccf4aff8b90656b9 (diff)
downloadgitlab-ce-68b6846fa6c7b630cc8dab7a8474dcc34e4d67d4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/regex.rb')
-rw-r--r--lib/gitlab/regex.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index e3a434dfe35..d9300da38a5 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -19,7 +19,7 @@ module Gitlab
# See https://github.com/docker/distribution/blob/master/reference/regexp.go.
#
def container_repository_name_regex
- @container_repository_regex ||= %r{\A[a-z0-9]+((?:[._/]|__|[-])[a-z0-9]+)*\Z}
+ @container_repository_regex ||= %r{\A[a-z0-9]+((?:[._/]|__|[-]{0,10})[a-z0-9]+)*\Z}
end
##