From f3f606966d7efb027e531344438e25a816c89c62 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Thu, 14 Dec 2017 08:56:00 +0000 Subject: Merge branch 'check-environment-regex' into 'master' Fix environment scope regex See merge request gitlab-org/gitlab-ee!3641 --- lib/gitlab/regex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb index 2c7b8af83f2..0002c7da8f1 100644 --- a/lib/gitlab/regex.rb +++ b/lib/gitlab/regex.rb @@ -37,7 +37,7 @@ module Gitlab end def environment_name_regex_chars - 'a-zA-Z0-9_/\\$\\{\\}\\. -' + 'a-zA-Z0-9_/\\$\\{\\}\\. \\-' end def environment_name_regex -- cgit v1.2.1 From c519e4a7286e838d2ef56d4ca4841e5b9b7bc1a2 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Wed, 20 Dec 2017 21:12:34 +0900 Subject: Add spec --- spec/lib/gitlab/regex_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb index 68a57826647..8b54d72d6f7 100644 --- a/spec/lib/gitlab/regex_spec.rb +++ b/spec/lib/gitlab/regex_spec.rb @@ -14,7 +14,7 @@ describe Gitlab::Regex do it { is_expected.not_to match('?gitlab') } end - describe '.environment_slug_regex' do + describe '.environment_name_regex' do subject { described_class.environment_name_regex } it { is_expected.to match('foo') } @@ -24,6 +24,7 @@ describe Gitlab::Regex do it { is_expected.to match('foo.1') } it { is_expected.not_to match('9&foo') } it { is_expected.not_to match('foo-^') } + it { is_expected.not_to match('!!()()') } end describe '.environment_slug_regex' do -- cgit v1.2.1