From 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Jan 2023 19:00:14 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-8-stable-ee --- danger/ci_templates/Dangerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'danger/ci_templates') 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 -- cgit v1.2.3