From 7f565423e6a0898dda97cc54311b097bcf4ba859 Mon Sep 17 00:00:00 2001
From: Philip <42116482+PhilipAbed@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:30:49 +0300
Subject: [PATCH] fix: Rebase with checkedBranches isnt working as expected
(#23675)
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
---
lib/workers/repository/update/branch/index.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/workers/repository/update/branch/index.ts b/lib/workers/repository/update/branch/index.ts
index f4e0d0088d..2b7b603b64 100644
--- a/lib/workers/repository/update/branch/index.ts
+++ b/lib/workers/repository/update/branch/index.ts
@@ -398,7 +398,7 @@ export async function processBranch(
}
}
- const userRebaseRequested =
+ let userRebaseRequested =
dependencyDashboardCheck === 'rebase' ||
!!config.dependencyDashboardRebaseAllOpen ||
!!config.rebaseRequested;
@@ -410,6 +410,7 @@ export async function processBranch(
} else if (dependencyDashboardCheck === 'global-config') {
logger.debug(`Manual create/rebase requested via checkedBranches`);
config.reuseExistingBranch = false;
+ userRebaseRequested = true;
} else if (userApproveAllPendingPR) {
logger.debug(
'A user manually approved all pending PRs via the Dependency Dashboard.'
--
GitLab