Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-26 09:09:56 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-26 09:09:56 +0300
commitf88f72df028c02be399ecf3d32c7cf0d8404784f (patch)
tree1a9a607f7a7915302a6f6ec296760279a2d0bb09 /lib/gitlab/ci/parsers
parentc2d7378a6896085f1f2d27c95455fc9728881e60 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/parsers')
-rw-r--r--lib/gitlab/ci/parsers/security/validators/schema_validator.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
index cef029bd749..0accf1be970 100644
--- a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
+++ b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
@@ -110,7 +110,7 @@ module Gitlab
log_warnings(problem_type: 'schema_validation_fails') unless schema_validation_errors.empty?
- if Feature.enabled?(:enforce_security_report_validation, @project)
+ if Feature.enabled?(:enforce_security_report_validation, @project, default_enabled: :yaml)
@errors += schema_validation_errors
else
@warnings += schema_validation_errors
@@ -147,7 +147,7 @@ module Gitlab
def add_unsupported_report_version_message
log_warnings(problem_type: 'using_unsupported_schema_version')
- if Feature.enabled?(:enforce_security_report_validation, @project)
+ if Feature.enabled?(:enforce_security_report_validation, @project, default_enabled: :yaml)
handle_unsupported_report_version(treat_as: :error)
else
handle_unsupported_report_version(treat_as: :warning)