diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /lib/gitlab/untrusted_regexp | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'lib/gitlab/untrusted_regexp')
-rw-r--r-- | lib/gitlab/untrusted_regexp/ruby_syntax.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/untrusted_regexp/ruby_syntax.rb b/lib/gitlab/untrusted_regexp/ruby_syntax.rb index 010214cf295..5176a6f6273 100644 --- a/lib/gitlab/untrusted_regexp/ruby_syntax.rb +++ b/lib/gitlab/untrusted_regexp/ruby_syntax.rb @@ -36,11 +36,11 @@ module Gitlab create_untrusted_regexp(matches[:regexp], matches[:flags]) rescue RegexpError raise unless fallback && - Feature.enabled?(:allow_unsafe_ruby_regexp, default_enabled: false) + Feature.enabled?(:allow_unsafe_ruby_regexp, default_enabled: :yaml) if Feature.enabled?(:ci_unsafe_regexp_logger, type: :ops, default_enabled: :yaml) Gitlab::AppJsonLogger.info( - class: self.class.name, + class: self.name, regexp: pattern.to_s, fabricated: 'unsafe ruby regexp', project_id: project&.id, |