Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 12 deletions

diff --git a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
index ee7733a081d..3a6b9ccdc33 100644
--- a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
+++ b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
@@ -93,11 +93,7 @@ module Gitlab
 
               log_warnings(problem_type: 'schema_validation_fails') unless schema_validation_errors.empty?
 
-              if Feature.enabled?(:enforce_security_report_validation, @project)
-                @errors += schema_validation_errors
-              else
-                @warnings += schema_validation_errors
-              end
+              @errors += schema_validation_errors
             end
 
             def populate_warnings
@@ -130,11 +126,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)
-                handle_unsupported_report_version(treat_as: :error)
-              else
-                handle_unsupported_report_version(treat_as: :warning)
-              end
+              handle_unsupported_report_version
             end
 
             def report_uses_deprecated_schema_version?
@@ -145,14 +137,14 @@ module Gitlab
               SUPPORTED_VERSIONS[report_type].include?(report_version)
             end
 
-            def handle_unsupported_report_version(treat_as:)
+            def handle_unsupported_report_version
               if report_version.nil?
                 message = "Report version not provided, #{report_type} report type supports versions: #{supported_schema_versions}"
               else
                 message = "Version #{report_version} for report type #{report_type} is unsupported, supported versions for this report type are: #{supported_schema_versions}"
               end
 
-              add_message_as(level: treat_as, message: message)
+              add_message_as(level: :error, message: message)
             end
 
             def supported_schema_versions