diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-07-06 15:45:38 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-07-06 16:25:03 +0800 |
| commit | d9435d61218f677395f3b53976a41ac5f361f24b (patch) | |
| tree | daeffa17eef21005694cea90eb300b359d433b66 /lib/gitlab/regex.rb | |
| parent | 2520edefb9a7481f575ac7bcdbcf89cb1432f27d (diff) | |
| download | gitlab-ce-d9435d61218f677395f3b53976a41ac5f361f24b.tar.gz | |
Backports for ee-2112
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
Diffstat (limited to 'lib/gitlab/regex.rb')
| -rw-r--r-- | lib/gitlab/regex.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb index 057f32eaef7..c1ee20b6977 100644 --- a/lib/gitlab/regex.rb +++ b/lib/gitlab/regex.rb @@ -30,8 +30,12 @@ module Gitlab @container_repository_regex ||= %r{\A[a-z0-9]+(?:[-._/][a-z0-9]+)*\Z} end + def environment_name_regex_chars + 'a-zA-Z0-9_/\\$\\{\\}\\. -' + end + def environment_name_regex - @environment_name_regex ||= /\A[a-zA-Z0-9_\\\/\${}. -]+\z/.freeze + @environment_name_regex ||= /\A[#{environment_name_regex_chars}]+\z/.freeze end def environment_name_regex_message |