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

5 files changed, 14 insertions, 23 deletions

diff --git a/danger/ci_templates/Dangerfile b/danger/ci_templates/Dangerfile
index ace9905e91d..bc8bba388c6 100644
--- a/danger/ci_templates/Dangerfile
+++ b/danger/ci_templates/Dangerfile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-TEMPLATE_MESSAGE = <<~MSG
+CI_CD_TEMPLATE_MESSAGE = <<~MSG
 This merge request requires a CI/CD Template review. To make sure these
 changes are reviewed, take the following steps:
 
@@ -11,7 +11,7 @@ changes are reviewed, take the following steps:
 1. Assign and `@` mention the CI/CD Template reviewer suggested by Reviewer Roulette.
 MSG
 
-TEMPLATE_FILES_MESSAGE = <<~MSG
+CI_CD_TEMPLATE_FILES_MESSAGE = <<~MSG
 The following files require a review from the CI/CD Templates maintainers:
 MSG
 
@@ -20,9 +20,12 @@ return unless helper.ci?
 template_paths_to_review = helper.changes_by_category[:ci_template]
 
 if helper.mr_labels.include?('ci::templates') || template_paths_to_review.any?
-  message 'This merge request adds or changes files that require a ' \
-    'review from the CI/CD Templates maintainers.'
+  message('This merge request adds or changes files that require a ' \
+          'review from the CI/CD Templates maintainers.')
 
-  markdown(TEMPLATE_MESSAGE)
-  markdown(TEMPLATE_FILES_MESSAGE + helper.markdown_list(template_paths_to_review)) if template_paths_to_review.any?
+  markdown(CI_CD_TEMPLATE_MESSAGE)
+
+  if template_paths_to_review.any?
+    markdown(CI_CD_TEMPLATE_FILES_MESSAGE + helper.markdown_list(template_paths_to_review))
+  end
 end
diff --git a/danger/gitaly/Dangerfile b/danger/gitaly/Dangerfile
index 59e55845c83..d7ff8d6446a 100644
--- a/danger/gitaly/Dangerfile
+++ b/danger/gitaly/Dangerfile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-TEMPLATE_MESSAGE = <<~MSG
+GITALY_COORDINATION_MESSAGE = <<~MSG
 This merge request requires coordination with gitaly deployments.
 Before merging this merge request we should verify that gitaly
 running in production already implements the new gRPC interface
@@ -18,5 +18,5 @@ changed_lines = helper.changed_lines('Gemfile.lock')
 if changed_lines.any? { |line| line =~ /^\+\s+gitaly \(/ }
   warn 'Changing gitaly gem can cause a multi-version incompatibility incident'
 
-  markdown(TEMPLATE_MESSAGE)
+  markdown(GITALY_COORDINATION_MESSAGE)
 end
diff --git a/danger/pipeline/Dangerfile b/danger/pipeline/Dangerfile
index 2fffd94be2e..c61fca86beb 100644
--- a/danger/pipeline/Dangerfile
+++ b/danger/pipeline/Dangerfile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-MESSAGE = <<~MESSAGE
+PIPELINE_CHANGES_MESSAGE = <<~MSG
 ## Pipeline Changes
 
 This merge request contains changes to the pipeline configuration for the GitLab project.
@@ -15,8 +15,8 @@ Please consider the effect of the changes in this merge request on the following
 - Effects on [pipeline performance](https://about.gitlab.com/handbook/engineering/quality/performance-indicators/#average-merge-request-pipeline-duration-for-gitlab)
 
 Please consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#pipeline-changes)
-MESSAGE
+MSG
 
 if helper.has_ci_changes?
-  markdown(MESSAGE)
+  markdown(PIPELINE_CHANGES_MESSAGE)
 end
diff --git a/danger/plugins/user_types.rb b/danger/plugins/user_types.rb
deleted file mode 100644
index 4f7dd572224..00000000000
--- a/danger/plugins/user_types.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../tooling/danger/user_types'
-
-module Danger
-  class UserTypes < ::Danger::Plugin
-    include Tooling::Danger::UserTypes
-  end
-end
diff --git a/danger/user_types/Dangerfile b/danger/user_types/Dangerfile
deleted file mode 100644
index 4b7ab1dbe39..00000000000
--- a/danger/user_types/Dangerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-user_types.bot_user_types_change_warning