Add latest changes from gitlab-org/gitlab@13-1-stable-ee

2 files changed, 6 insertions, 3 deletions

diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 1ea59491378..66050a7bbe0 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -28,7 +28,7 @@ module Gitlab
                 in: %i[release],
                 message: 'release features are not enabled'
               },
-              unless: -> { Feature.enabled?(:ci_release_generation, default_enabled: false) }
+              unless: -> { Gitlab::Ci::Features.release_generation_enabled? }
 
             with_options allow_nil: true do
               validates :allow_failure, boolean: true
diff --git a/lib/gitlab/ci/config/entry/reports.rb b/lib/gitlab/ci/config/entry/reports.rb
index 1a871e043a6..74736b24d73 100644
--- a/lib/gitlab/ci/config/entry/reports.rb
+++ b/lib/gitlab/ci/config/entry/reports.rb
@@ -12,9 +12,10 @@ module Gitlab
           include ::Gitlab::Config::Entry::Attributable
 
           ALLOWED_KEYS =
-            %i[junit codequality sast dependency_scanning container_scanning
+            %i[junit codequality sast secret_detection dependency_scanning container_scanning
                dast performance license_management license_scanning metrics lsif
-               dotenv cobertura terraform accessibility cluster_applications].freeze
+               dotenv cobertura terraform accessibility cluster_applications
+               requirements].freeze
 
           attributes ALLOWED_KEYS
 
@@ -26,6 +27,7 @@ module Gitlab
               validates :junit, array_of_strings_or_string: true
               validates :codequality, array_of_strings_or_string: true
               validates :sast, array_of_strings_or_string: true
+              validates :secret_detection, array_of_strings_or_string: true
               validates :dependency_scanning, array_of_strings_or_string: true
               validates :container_scanning, array_of_strings_or_string: true
               validates :dast, array_of_strings_or_string: true
@@ -39,6 +41,7 @@ module Gitlab
               validates :terraform, array_of_strings_or_string: true
               validates :accessibility, array_of_strings_or_string: true
               validates :cluster_applications, array_of_strings_or_string: true
+              validates :requirements, array_of_strings_or_string: true
             end
           end