From ae1b3d982482280f22a907faba2c9ba02f4d1db1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 10 Feb 2023 15:11:01 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- tooling/danger/stable_branch.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tooling') diff --git a/tooling/danger/stable_branch.rb b/tooling/danger/stable_branch.rb index 6c0b94b4f06..034e31bb0cc 100644 --- a/tooling/danger/stable_branch.rb +++ b/tooling/danger/stable_branch.rb @@ -33,7 +33,7 @@ module Tooling MSG VERSION_ERROR_MESSAGE = <<~MSG - Patches are only being accepted on the most recent 3 minor versions of GitLab. #{MAINTENANCE_POLICY_MESSAGE} + Patches are generally only accepted on the most recent 3 minor versions of GitLab. #{MAINTENANCE_POLICY_MESSAGE} MSG FAILED_VERSION_REQUEST_MESSAGE = <<~MSG @@ -46,7 +46,8 @@ module Tooling fail FEATURE_ERROR_MESSAGE if has_feature_label? fail BUG_ERROR_MESSAGE unless has_bug_label? - fail VERSION_ERROR_MESSAGE unless targeting_patchable_version? + + warn VERSION_ERROR_MESSAGE unless targeting_patchable_version? end # rubocop:enable Style/SignalException @@ -69,7 +70,6 @@ module Tooling last_three_minor_versions.include?(targeted_version) rescue VersionApiError - # don't fail the job since we do not know the recent versions warn FAILED_VERSION_REQUEST_MESSAGE true end -- cgit v1.2.3