From 9b0cf0ac6ac6f8a5d67a9cf97eea5415d0fa4a3a Mon Sep 17 00:00:00 2001
From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
Date: Thu, 27 Apr 2023 21:44:49 +0200
Subject: [PATCH] fix: improve user-facing ignored PR messages (#21813)
---
lib/config/options/index.ts | 6 +++---
.../repository/config-migration/branch/index.spec.ts | 2 +-
lib/workers/repository/config-migration/branch/index.ts | 2 +-
lib/workers/repository/update/branch/handle-existing.ts | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
index 76a7881dd4..60153f1ef7 100644
--- a/lib/config/options/index.ts
+++ b/lib/config/options/index.ts
@@ -2604,11 +2604,11 @@ const options: RenovateOptions[] = [
default: {
ignoreTopic: 'Renovate Ignore Notification',
ignoreMajor:
- 'As this PR has been closed unmerged, Renovate will ignore this upgrade and you will not receive PRs for *any* future {{{newMajor}}}.x releases. However, if you upgrade to {{{newMajor}}}.x manually then Renovate will reenable minor and patch updates automatically.',
+ 'Because you closed this PR without merging, Renovate will ignore this update. You will not get PRs for *any* future {{{newMajor}}}.x releases. But if you manually upgrade to {{{newMajor}}}.x then Renovate will re-enable `minor` and `patch` updates automatically.',
ignoreDigest:
- 'As this PR has been closed unmerged, Renovate will ignore this upgrade and you will not receive PRs for the `{{{depName}}}` `{{{newDigestShort}}}` update again.',
+ 'Because you closed this PR without merging, Renovate will ignore this update. You will not get PRs for the `{{{depName}}}` `{{{newDigestShort}}}` update again.',
ignoreOther:
- 'As this PR has been closed unmerged, Renovate will now ignore this update ({{{newValue}}}). You will still receive a PR once a newer version is released, so if you wish to permanently ignore this dependency, please add it to the `ignoreDeps` array of your renovate config.',
+ 'Because you closed this PR without merging, Renovate will ignore this update ({{{newValue}}}). You will get a PR once a newer version is released. To ignore this dependency forever, add it to the `ignoreDeps` array of your Renovate config.',
},
},
{
diff --git a/lib/workers/repository/config-migration/branch/index.spec.ts b/lib/workers/repository/config-migration/branch/index.spec.ts
index 6e61859b42..a9f89c6059 100644
--- a/lib/workers/repository/config-migration/branch/index.spec.ts
+++ b/lib/workers/repository/config-migration/branch/index.spec.ts
@@ -122,7 +122,7 @@ describe('workers/repository/config-migration/branch/index', () => {
expect(platform.ensureComment).toHaveBeenCalledTimes(1);
expect(platform.ensureComment).toHaveBeenCalledWith({
content:
- '\n\nIf this PR was closed by mistake or you changed your mind, you can simply rename this PR and you will soon get a fresh replacement PR opened.',
+ '\n\nIf you accidentally closed this PR, or if you changed your mind: rename this PR to get a fresh replacement PR.',
topic: 'Renovate Ignore Notification',
number: 1,
});
diff --git a/lib/workers/repository/config-migration/branch/index.ts b/lib/workers/repository/config-migration/branch/index.ts
index 7a3ff0d41d..25ee7ea7bc 100644
--- a/lib/workers/repository/config-migration/branch/index.ts
+++ b/lib/workers/repository/config-migration/branch/index.ts
@@ -87,7 +87,7 @@ async function handlepr(config: RenovateConfig, pr: Pr): Promise<void> {
);
} else {
const content =
- '\n\nIf this PR was closed by mistake or you changed your mind, you can simply rename this PR and you will soon get a fresh replacement PR opened.';
+ '\n\nIf you accidentally closed this PR, or if you changed your mind: rename this PR to get a fresh replacement PR.';
await ensureComment({
number: pr.number,
topic: 'Renovate Ignore Notification',
diff --git a/lib/workers/repository/update/branch/handle-existing.ts b/lib/workers/repository/update/branch/handle-existing.ts
index 20ce0dd658..aa99ace74a 100644
--- a/lib/workers/repository/update/branch/handle-existing.ts
+++ b/lib/workers/repository/update/branch/handle-existing.ts
@@ -26,7 +26,7 @@ export async function handleClosedPr(
content = template.compile(userStrings.ignoreOther, config);
}
content +=
- '\n\nIf this PR was closed by mistake or you changed your mind, you can simply rename this PR and you will soon get a fresh replacement PR opened.';
+ '\n\nIf you accidentally closed this PR, or if you changed your mind: rename this PR to get a fresh replacement PR.';
if (!config.suppressNotifications!.includes('prIgnoreNotification')) {
if (GlobalConfig.get('dryRun')) {
logger.info(
--
GitLab