From 1430a8eb5bdf6618fb285f825b9a1d4b77b916c4 Mon Sep 17 00:00:00 2001 From: Kevin Burnett <18027+burnettk@users.noreply.github.com> Date: Wed, 11 May 2022 14:00:46 -0700 Subject: [PATCH 1/3] clarify that there are two different approaches one uses github actions and the other does not. --- .../automating-dependabot-with-github-actions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md b/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md index 2d2daaaf8b..a2e20b8ecf 100644 --- a/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md +++ b/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md @@ -452,9 +452,9 @@ jobs: ### Enable auto-merge on a pull request -If you want to auto-merge your pull requests, you can use {% data variables.product.prodname_dotcom %}'s auto-merge functionality. This enables the pull request to be merged when all required tests and approvals are successfully met. For more information on auto-merge, see "[Automatically merging a pull request](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)." +If you want to allow maintainers to mark certain pull requests for auto-merge, you can use {% data variables.product.prodname_dotcom %}'s auto-merge functionality. This enables the pull request to be merged when all required tests and approvals are successfully met. For more information on auto-merge, see "[Automatically merging a pull request](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)." -Here is an example of enabling auto-merge for all patch updates to `my-dependency`: +You can instead use github actions and the github CLI. Here is an example that auto merges all patch updates to `my-dependency`: {% ifversion ghes = 3.3 %} From 604608f21927b9532e440080928b484d80e55509 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Fri, 13 May 2022 14:27:44 +0100 Subject: [PATCH 2/3] Update content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md --- .../automating-dependabot-with-github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md b/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md index a2e20b8ecf..e3215961bc 100644 --- a/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md +++ b/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md @@ -454,7 +454,7 @@ jobs: If you want to allow maintainers to mark certain pull requests for auto-merge, you can use {% data variables.product.prodname_dotcom %}'s auto-merge functionality. This enables the pull request to be merged when all required tests and approvals are successfully met. For more information on auto-merge, see "[Automatically merging a pull request](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)." -You can instead use github actions and the github CLI. Here is an example that auto merges all patch updates to `my-dependency`: +You can instead use {% data variables.product.prodname_actions %} and the {% data variables.product.prodname_dotcom %} CLI. Here is an example that auto merges all patch updates to `my-dependency`: {% ifversion ghes = 3.3 %} From 0d8b875032aa41ec90e767e6c7f03d571a28617c Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Fri, 13 May 2022 14:36:25 +0100 Subject: [PATCH 3/3] Update content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md --- .../automating-dependabot-with-github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md b/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md index e3215961bc..e4f4b8730a 100644 --- a/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md +++ b/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md @@ -454,7 +454,7 @@ jobs: If you want to allow maintainers to mark certain pull requests for auto-merge, you can use {% data variables.product.prodname_dotcom %}'s auto-merge functionality. This enables the pull request to be merged when all required tests and approvals are successfully met. For more information on auto-merge, see "[Automatically merging a pull request](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)." -You can instead use {% data variables.product.prodname_actions %} and the {% data variables.product.prodname_dotcom %} CLI. Here is an example that auto merges all patch updates to `my-dependency`: +You can instead use {% data variables.product.prodname_actions %} and the {% data variables.product.prodname_cli %}. Here is an example that auto merges all patch updates to `my-dependency`: {% ifversion ghes = 3.3 %}