Add latest changes from gitlab-org/gitlab@master

7 files changed, 9 insertions, 8 deletions

diff --git a/lib/gitlab/ci/pipeline/chain/command.rb b/lib/gitlab/ci/pipeline/chain/command.rb
index dbaa6951e64..d1882059dd8 100644
--- a/lib/gitlab/ci/pipeline/chain/command.rb
+++ b/lib/gitlab/ci/pipeline/chain/command.rb
@@ -12,7 +12,7 @@ module Gitlab
           :seeds_block, :variables_attributes, :push_options,
           :chat_data, :allow_mirror_update, :bridge, :content, :dry_run,
           # These attributes are set by Chains during processing:
-          :config_content, :config_processor, :stage_seeds
+          :config_content, :yaml_processor_result, :stage_seeds
         ) do
           include Gitlab::Utils::StrongMemoize
 
diff --git a/lib/gitlab/ci/pipeline/chain/config/process.rb b/lib/gitlab/ci/pipeline/chain/config/process.rb
index 5eaad1b9485..8ccb33ffd34 100644
--- a/lib/gitlab/ci/pipeline/chain/config/process.rb
+++ b/lib/gitlab/ci/pipeline/chain/config/process.rb
@@ -23,7 +23,7 @@ module Gitlab
               add_warnings_to_pipeline(result.warnings)
 
               if result.valid?
-                @command.config_processor = result
+                @command.yaml_processor_result = result
               else
                 error(result.errors.first, config_error: true)
               end
diff --git a/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules.rb b/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules.rb
index a793ae9cc24..3c910963a2a 100644
--- a/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules.rb
+++ b/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules.rb
@@ -39,7 +39,7 @@ module Gitlab
           end
 
           def workflow_config
-            @command.config_processor.workflow_attributes || {}
+            @command.yaml_processor_result.workflow_attributes || {}
           end
         end
       end
diff --git a/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs.rb b/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs.rb
index 9267c72efa4..71f22c52869 100644
--- a/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs.rb
+++ b/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs.rb
@@ -6,13 +6,13 @@ module Gitlab
       module Chain
         class RemoveUnwantedChatJobs < Chain::Base
           def perform!
-            raise ArgumentError, 'missing config processor' unless @command.config_processor
+            raise ArgumentError, 'missing YAML processor result' unless @command.yaml_processor_result
 
             return unless pipeline.chat?
 
             # When scheduling a chat pipeline we only want to run the build
             # that matches the chat command.
-            @command.config_processor.jobs.select! do |name, _|
+            @command.yaml_processor_result.jobs.select! do |name, _|
               name.to_s == command.chat_data[:command].to_s
             end
           end
diff --git a/lib/gitlab/ci/pipeline/chain/seed.rb b/lib/gitlab/ci/pipeline/chain/seed.rb
index e48e79d561b..e10a0bc3718 100644
--- a/lib/gitlab/ci/pipeline/chain/seed.rb
+++ b/lib/gitlab/ci/pipeline/chain/seed.rb
@@ -9,7 +9,7 @@ module Gitlab
           include Gitlab::Utils::StrongMemoize
 
           def perform!
-            raise ArgumentError, 'missing config processor' unless @command.config_processor
+            raise ArgumentError, 'missing YAML processor result' unless @command.yaml_processor_result
 
             # Allocate next IID. This operation must be outside of transactions of pipeline creations.
             pipeline.ensure_project_iid!
@@ -56,7 +56,7 @@ module Gitlab
           end
 
           def stages_attributes
-            @command.config_processor.stages_attributes
+            @command.yaml_processor_result.stages_attributes
           end
         end
       end
diff --git a/lib/gitlab/ci/pipeline/chain/validate/external.rb b/lib/gitlab/ci/pipeline/chain/validate/external.rb
index 24628338dd2..d056501a6d3 100644
--- a/lib/gitlab/ci/pipeline/chain/validate/external.rb
+++ b/lib/gitlab/ci/pipeline/chain/validate/external.rb
@@ -51,7 +51,7 @@ module Gitlab
             def validate_service_request
               Gitlab::HTTP.post(
                 validation_service_url, timeout: VALIDATION_REQUEST_TIMEOUT,
-                body: validation_service_payload(@pipeline, @command.config_processor.stages_attributes)
+                body: validation_service_payload(@pipeline, @command.yaml_processor_result.stages_attributes)
               )
             end
 
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index 878f11eb9ce..5694ce8255a 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -192,6 +192,7 @@ module Gitlab
         # Files that don't fit into any category are marked with :none
         %r{\A(ee/)?changelogs/} => :none,
         %r{\Alocale/gitlab\.pot\z} => :none,
+        %r{\Adata/whats_new/} => :none,
 
         # Fallbacks in case the above patterns miss anything
         %r{\.rb\z} => :backend,