From 5069b6010933e3aab044e703ec49e4a2d7d8a9ac Mon Sep 17 00:00:00 2001
From: Ryan Delaney <1139517+rpdelaney@users.noreply.github.com>
Date: Tue, 9 Aug 2022 06:46:58 -0400
Subject: [PATCH] fix(docs): comma splices in help text (#17049)
---
lib/modules/platform/azure/index.ts | 2 +-
lib/workers/repository/finalise/prune.ts | 2 +-
lib/workers/repository/onboarding/pr/index.ts | 2 +-
lib/workers/repository/update/pr/index.ts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/modules/platform/azure/index.ts b/lib/modules/platform/azure/index.ts
index feb18fac53..223288f16f 100644
--- a/lib/modules/platform/azure/index.ts
+++ b/lib/modules/platform/azure/index.ts
@@ -724,7 +724,7 @@ export async function mergePr({
`Expected PR to have status ${
PullRequestStatus[PullRequestStatus.Completed]
// TODO #7154
- }, however it is ${PullRequestStatus[pr.status!]}.`
+ }. However, it is ${PullRequestStatus[pr.status!]}.`
);
}
return true;
diff --git a/lib/workers/repository/finalise/prune.ts b/lib/workers/repository/finalise/prune.ts
index e96cfd2c8c..9f8208b1cd 100644
--- a/lib/workers/repository/finalise/prune.ts
+++ b/lib/workers/repository/finalise/prune.ts
@@ -39,7 +39,7 @@ async function cleanUpBranches(
number: pr.number,
topic: 'Autoclosing Skipped',
content:
- 'This PR has been flagged for autoclosing, however it is being skipped due to the branch being already modified. Please close/delete it manually or report a bug if you think this is in error.',
+ 'This PR has been flagged for autoclosing. However, it is being skipped due to the branch being already modified. Please close/delete it manually or report a bug if you think this is in error.',
});
}
} else if (GlobalConfig.get('dryRun')) {
diff --git a/lib/workers/repository/onboarding/pr/index.ts b/lib/workers/repository/onboarding/pr/index.ts
index 910eb2c67c..905f564375 100644
--- a/lib/workers/repository/onboarding/pr/index.ts
+++ b/lib/workers/repository/onboarding/pr/index.ts
@@ -104,7 +104,7 @@ If you need any further assistance then you can also [request help here](${
);
if (isConflicted) {
configDesc += emojify(
- `:warning: This PR has a merge conflict, however Renovate is unable to automatically fix that due to edits in this branch. Please resolve the merge conflict manually.\n\n`
+ `:warning: This PR has a merge conflict. However, Renovate is unable to automatically fix that due to edits in this branch. Please resolve the merge conflict manually.\n\n`
);
} else {
configDesc += `Important: Now that this branch is edited, Renovate can't rebase it from the base branch any more. If you make changes to the base branch that could impact this onboarding PR, please merge them manually.\n\n`;
diff --git a/lib/workers/repository/update/pr/index.ts b/lib/workers/repository/update/pr/index.ts
index bc2a663b20..6f049390f0 100644
--- a/lib/workers/repository/update/pr/index.ts
+++ b/lib/workers/repository/update/pr/index.ts
@@ -391,7 +391,7 @@ export async function ensurePr(
) {
const topic = 'Branch automerge failure';
let content =
- 'This PR was configured for branch automerge, however this is not possible so it has been raised as a PR instead.';
+ 'This PR was configured for branch automerge. However, this is not possible, so it has been raised as a PR instead.';
if (config.branchAutomergeFailureMessage === 'branch status error') {
content += '\n___\n * Branch has one or more failed status checks';
}
--
GitLab