From 800be4d66aa56d6a5e5c327b1bd298f29235ce24 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Thu, 4 Nov 2021 13:15:51 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> --- docs/usage/configuration-options.md | 10 +++++----- lib/manager/regex/index.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md index 22680a2bac6891..39d40093b2b0b9 100644 --- a/docs/usage/configuration-options.md +++ b/docs/usage/configuration-options.md @@ -763,8 +763,8 @@ Configuration added here applies for all Go-related updates, however currently t For self-hosted users, `GOPROXY`, `GONOPROXY` and `GOPRIVATE` environment variables are supported ([reference](https://golang.org/ref/mod#module-proxy)). -Usage of `direct` will fallback to Renovate-native release fetching mechanism. -Also we support `off` keyword which immediately will stop any fetching. +Usage of `direct` will fallback to the Renovate-native release fetching mechanism. +Also we support the `off` keyword which will stop any fetching immediately. ## group @@ -1668,7 +1668,7 @@ If enabled Renovate will pin Docker images by means of their SHA256 digest and n ## platformAutomerge -If you have enabled `automerge` and set `automergeType=pr` in the Renovate config, then you can also set `platformAutomerge` to true to speed up merging via the platform's native automerge functionality. +If you have enabled `automerge` and set `automergeType=pr` in the Renovate config, then you can also set `platformAutomerge` to `true` to speed up merging via the platform's native automerge functionality. Renovate tries platform-native automerge only when it initially creates the PR. Any PR that is being updated will be automerged with the Renovate-based automerge. @@ -1677,9 +1677,9 @@ Any PR that is being updated will be automerged with the Renovate-based automerg This option is available for Azure, GitHub and GitLab. It falls back to Renovate-based automerge if the platform-native automerge is not available. -You can also fine tune the behavior by setting `packageRules` if you want to use it selectively (e.g. per-package). +You can also fine-tune the behavior by setting `packageRules` if you want to use it selectively (e.g. per-package). -If you rely on Renovate's behavior of rebasing automerging branches when `rebaseWhen=auto`, then note that you are no longer guaranteed of up-to-date branches when automerging if you enable platform automerge, unless you use some type of branch protection rules to achieve the same. +If you rely on Renovate's behavior of rebasing automerging branches when `rebaseWhen=auto`, then note that you are no longer guaranteed of up-to-date branches when automerging if you enable platform automerge. For example, GitHub might automerge a Renovate branch even if it is one or more commits behind the base branch at the time. ## postUpdateOptions diff --git a/lib/manager/regex/index.ts b/lib/manager/regex/index.ts index 0facc64a35de42..beb11affa4ce36 100644 --- a/lib/manager/regex/index.ts +++ b/lib/manager/regex/index.ts @@ -154,7 +154,7 @@ function handleRecursive( return []; } return regexMatchAll(regexes[index], content).flatMap((match) => { - // if we have a depName and a currentValue with have the minimal viable definition + // if we have a depName and a currentValue which have the minimal viable definition if (match?.groups?.depName && match?.groups?.currentValue) { return createDependency( {