From c718352614c6ccf6fc05b58981c03471a58782b9 Mon Sep 17 00:00:00 2001
From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
Date: Wed, 23 Jun 2021 16:40:37 +0200
Subject: [PATCH] fix: explain pending branch automerge checkbox behavior
(#10569)
---
lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt | 2 +-
lib/workers/repository/dependency-dashboard.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt b/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt
index 9b855668ee..5013e150d8 100644
--- a/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt
+++ b/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt
@@ -29,7 +29,7 @@ These updates encountered an error and will be retried. Click a checkbox below t
## Pending Branch Automerge
-These updates await pending status checks before automerging.
+These updates await pending status checks before automerging. Click on a checkbox to abort the branch automerge, and create a PR instead.
- [ ] <!-- approvePr-branch=branchName9 -->pr9
diff --git a/lib/workers/repository/dependency-dashboard.ts b/lib/workers/repository/dependency-dashboard.ts
index 620885fca7..04c03feaa8 100644
--- a/lib/workers/repository/dependency-dashboard.ts
+++ b/lib/workers/repository/dependency-dashboard.ts
@@ -232,7 +232,7 @@ export async function ensureDependencyDashboard(
);
if (prPendingBranchAutomerge.length) {
issueBody += '## Pending Branch Automerge\n\n';
- issueBody += `These updates await pending status checks before automerging.\n\n`;
+ issueBody += `These updates await pending status checks before automerging. Click on a checkbox to abort the branch automerge, and create a PR instead.\n\n`;
for (const branch of prPendingBranchAutomerge) {
issueBody += getListItem(branch, 'approvePr');
}
--
GitLab