Skip to content

refactor(dashboard): standardize blocked section headings #39753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
setchy wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

refactor(dashboard): standardize blocked section headings #39753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/workers/repository/__fixtures__/dependency-dashboard-with-2-PR-closed-ignored.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This issue lists Renovate updates and detected dependencies. Read the [Dependency Dashboard](https://docs.renovatebot.com/key-concepts/dashboard/) docs to learn more.

## Ignored or Blocked
## PR Closed (Blocked)

The following updates are blocked by an existing closed PR. To recreate the PR, click on a checkbox below.

Expand Down
2 changes: 1 addition & 1 deletion lib/workers/repository/__fixtures__/dependency-dashboard-with-2-PR-edited.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This issue lists Renovate updates and detected dependencies. Read the [Dependency Dashboard](https://docs.renovatebot.com/key-concepts/dashboard/) docs to learn more.

## Edited/Blocked
## PR Edited (Blocked)

The following updates have been manually edited so Renovate will no longer make changes. To discard all commits and start over, click on a checkbox below.

Expand Down
6 changes: 3 additions & 3 deletions lib/workers/repository/dependency-dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ export async function ensureDependencyDashboard(
` See Config Migration PR: #${configMigrationRes.prNumber}.\n\n`;
} else if (configMigrationRes?.result === 'pr-modified') {
issueBody +=
'## Config Migration Needed (error)\n\n' +
'## Config Migration Needed (Blocked)\n\n' +
getMarkdownComment(configMigrationPrInfo) +
` The Config Migration branch exists but has been modified by another user. Renovate will not push to this branch unless it is first deleted. \n\n See Config Migration PR: #${configMigrationRes.prNumber}.\n\n`;
} else if (configMigrationRes?.result === 'add-checkbox') {
Expand Down Expand Up @@ -493,7 +493,7 @@ export async function ensureDependencyDashboard(
issueBody += getBranchesListMd(
branches,
(branch) => branch.result === 'pr-edited',
'Edited/Blocked',
'PR Edited (Blocked)',
'The following updates have been manually edited so Renovate will no longer make changes. To discard all commits and start over, click on a checkbox below.',
'rebase',
);
Expand Down Expand Up @@ -555,7 +555,7 @@ export async function ensureDependencyDashboard(
issueBody += getBranchesListMd(
branches,
(branch) => branch.result === 'already-existed',
'Ignored or Blocked',
'PR Closed (Blocked)',
'The following updates are blocked by an existing closed PR. To recreate the PR, click on a checkbox below.',
'recreate',
);
Expand Down