Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

5 files changed, 16 insertions, 24 deletions

diff --git a/lib/gitlab/ci/config/entry/cache.rb b/lib/gitlab/ci/config/entry/cache.rb
index a5481071fc5..a635f409109 100644
--- a/lib/gitlab/ci/config/entry/cache.rb
+++ b/lib/gitlab/ci/config/entry/cache.rb
@@ -9,7 +9,7 @@ module Gitlab
           include ::Gitlab::Config::Entry::Validatable
           include ::Gitlab::Config::Entry::Attributable
 
-          ALLOWED_KEYS = %i[key untracked paths when policy].freeze
+          ALLOWED_KEYS = %i[key untracked paths when policy unprotect].freeze
           ALLOWED_POLICY = %w[pull-push push pull].freeze
           DEFAULT_POLICY = 'pull-push'
           ALLOWED_WHEN = %w[on_success on_failure always].freeze
@@ -33,18 +33,22 @@ module Gitlab
           entry :key, Entry::Key,
             description: 'Cache key used to define a cache affinity.'
 
+          entry :unprotect, ::Gitlab::Config::Entry::Boolean,
+            description: 'Unprotect the cache from a protected ref.'
+
           entry :untracked, ::Gitlab::Config::Entry::Boolean,
             description: 'Cache all untracked files.'
 
           entry :paths, Entry::Paths,
             description: 'Specify which paths should be cached across builds.'
 
-          attributes :policy, :when
+          attributes :policy, :when, :unprotect
 
           def value
             result = super
 
             result[:key] = key_value
+            result[:unprotect] = unprotect || false
             result[:policy] = policy || DEFAULT_POLICY
             # Use self.when to avoid conflict with reserved word
             result[:when] = self.when || DEFAULT_WHEN
diff --git a/lib/gitlab/ci/config/entry/processable.rb b/lib/gitlab/ci/config/entry/processable.rb
index e0a052ffdfd..e0f0903174c 100644
--- a/lib/gitlab/ci/config/entry/processable.rb
+++ b/lib/gitlab/ci/config/entry/processable.rb
@@ -27,9 +27,9 @@ module Gitlab
 
               validates :config, disallowed_keys: {
                   in: %i[only except start_in],
-                  message: 'key may not be used with `rules`'
-                },
-                                 if: :has_rules?
+                  message: 'key may not be used with `rules`',
+                  ignore_nil: true
+                }, if: :has_rules_value?
 
               with_options allow_nil: true do
                 validates :extends, array_of_strings_or_string: true
diff --git a/lib/gitlab/ci/config/entry/product/parallel.rb b/lib/gitlab/ci/config/entry/product/parallel.rb
index 5c78a8f68c7..e91714e3f5c 100644
--- a/lib/gitlab/ci/config/entry/product/parallel.rb
+++ b/lib/gitlab/ci/config/entry/product/parallel.rb
@@ -12,7 +12,7 @@ module Gitlab
             strategy :ParallelBuilds, if: -> (config) { config.is_a?(Numeric) }
             strategy :MatrixBuilds, if: -> (config) { config.is_a?(Hash) }
 
-            PARALLEL_LIMIT = 50
+            PARALLEL_LIMIT = 200
 
             class ParallelBuilds < ::Gitlab::Config::Entry::Node
               include ::Gitlab::Config::Entry::Validatable
diff --git a/lib/gitlab/ci/config/entry/reports.rb b/lib/gitlab/ci/config/entry/reports.rb
index 16844fa88db..6408f412e6f 100644
--- a/lib/gitlab/ci/config/entry/reports.rb
+++ b/lib/gitlab/ci/config/entry/reports.rb
@@ -54,7 +54,7 @@ module Gitlab
           end
 
           def value
-            @config.transform_values do |value|
+            @config.compact.transform_values do |value|
               if value.is_a?(Hash)
                 value
               else
diff --git a/lib/gitlab/ci/config/entry/variable.rb b/lib/gitlab/ci/config/entry/variable.rb
index decb568ffc9..a5c6aaa1e3a 100644
--- a/lib/gitlab/ci/config/entry/variable.rb
+++ b/lib/gitlab/ci/config/entry/variable.rb
@@ -54,9 +54,7 @@ module Gitlab
               validates :key, alphanumeric: true
               validates :config_value, alphanumeric: true, allow_nil: true
               validates :config_description, alphanumeric: true, allow_nil: true
-              validates :config_expand, boolean: true, allow_nil: true, if: -> {
-                                                                              ci_raw_variables_in_yaml_config_enabled?
-                                                                            }
+              validates :config_expand, boolean: true, allow_nil: true
               validates :config_options, array_of_strings: true, allow_nil: true
 
               validate do
@@ -82,16 +80,10 @@ module Gitlab
             end
 
             def value_with_data
-              if ci_raw_variables_in_yaml_config_enabled?
-                {
-                  value: config_value.to_s,
-                  raw: (!config_expand if has_config_expand?)
-                }.compact
-              else
-                {
-                  value: config_value.to_s
-                }.compact
-              end
+              {
+                value: config_value.to_s,
+                raw: (!config_expand if has_config_expand?)
+              }.compact
             end
 
             def value_with_prefill_data
@@ -100,10 +92,6 @@ module Gitlab
                 options: config_options
               ).compact
             end
-
-            def ci_raw_variables_in_yaml_config_enabled?
-              YamlProcessor::FeatureFlags.enabled?(:ci_raw_variables_in_yaml_config)
-            end
           end
 
           class UnknownStrategy < ::Gitlab::Config::Entry::Node