Merge pull request #23467 from github/repo-sync

repo sync

.github/workflows/copy-api-issue-to-internal.yml

@@ -1,7 +1,7 @@
-name: Copy to REST API issue to docs-content
+name: Copy to API/events issue to docs-content
 
 # **What it does**: Copies an issue in the open source repo to the docs-content repo, comments on and closes the original issue
-# **Why we have it**: REST API updates cannot be made in the open source repo. Instead, we copy the issue to an internal issue (we do not transfer so that the issue does not disappear for the contributor) and close the original issue.
+# **Why we have it**: OpenAPI/GraphQL schema updates cannot be made in the open source repo. Instead, we copy the issue to an internal issue (we do not transfer so that the issue does not disappear for the contributor) and close the original issue.
 # **Who does it impact**: Open source and docs-content maintainers
 
 on:
@@ -16,7 +16,7 @@ jobs:
   transfer-issue:
     name: Transfer issue
     runs-on: ubuntu-latest
-    if: (github.event.label.name == 'rest-description' || github.event.label.name == 'graphql-description') && github.repository == 'github/docs'
+    if: (github.event.label.name == 'rest-description' || github.event.label.name == 'graphql-description' || github.event.label.name == 'webhook-description') && github.repository == 'github/docs'
     steps:
       - name: Check if this run was triggered by a member of the docs team
         uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
@@ -53,7 +53,7 @@ jobs:
           ISSUE_BODY: ${{ github.event.issue.body }}
 
       - name: Comment on the old issue
-        run: gh issue comment $OLD_ISSUE --body "Thank you for opening this issue! Updates to the REST/GraphQL API description must be made internally. I have copied your issue to an internal issue, so I will close this issue."
+        run: gh issue comment $OLD_ISSUE --body "Thank you for opening this issue! Updates to the REST API, GraphQL API, and webhook reference documentation must be made internally. I have copied your issue to an internal issue, so I will close this issue."
         env:
           GITHUB_TOKEN: ${{secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES}}
           OLD_ISSUE: ${{ github.event.issue.html_url }}

content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md

@@ -10,6 +10,7 @@ shortTitle: Merge PR with merge queue
 redirect_from:
   - /pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue
   - /github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue
+defaultTool: webui
 ---
 
 {% data reusables.pull_requests.merge-queue-beta %}
@@ -21,6 +22,14 @@ redirect_from:
 
 ## Adding a pull request to a merge queue
 
+{% webui %}
+
+{% tip %}
+
+**Tip:** You can use {% data variables.product.prodname_cli %} to add a pull request to a merge queue. For more information, click the "{% data variables.product.prodname_cli %}" tab at the top of this article.
+
+{% endtip %}
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-pr %}
 
@@ -38,8 +47,22 @@ redirect_from:
 
 1. Confirm you want to add the pull request to the merge queue by clicking  **Confirm merge when ready**.
 
+{% endwebui %}
+
+{% cli %}
+
+With {% data variables.product.prodname_cli %}, you can use the `gh pr merge` command to add a pull request to a merge queue. If you are targeting a branch that requires a merge queue, this command automatically adds the pull request to the queue if required checks have passed. If required checks have not passed, this command enables auto-merge for the pull request. For more information, see [`gh pr merge`](https://cli.github.com/manual/gh_pr_merge) in the {% data variables.product.prodname_cli %} manual.
+
+{% endcli %}
+
 ## Removing a pull request from a merge queue
 
+{% cli %}
+
+To remove a pull request from a merge queue, you must navigate to the repository's page on {% data variables.location.product_location %}. You cannot use {% data variables.product.prodname_cli %} to remove a pull request from a merge queue.
+
+{% endcli %}
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-pr %}
 
@@ -52,8 +75,18 @@ Alternatively, you can navigate to the merge queue page for the base branch, cli
 
 ## Viewing merge queues
 
+{% cli %}
+
+You can view the merge queue for a base branch in various places on {% data variables.product.product_name %}. You cannot use {% data variables.product.prodname_cli %} to view a merge queue.
+
+{% endcli %}
+
+{% webui %}
+
 You can view the merge queue for a base branch in various places on {% data variables.product.product_name %}.
 
+{% endwebui %}
+
 - On the **Branches** page for the repository. We recommend you use this route if you don't have or don't know about a pull request already in a queue, and if you want to see what's in that queue. For more information, see "[Viewing branches in your repository](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/viewing-branches-in-your-repository)."
 
   ![View merge queue in Branches page](/assets/images/help/pull_requests/merge-queue-branches-page.png)

data/reusables/secret-scanning/push-protection-beta.md

@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** {% data variables.product.prodname_secret_scanning_caps %} as a protection push is currently in beta and subject to change. To request access to the beta release, [contact your account management team](https://github.com/enterprise/contact).
+**Note:** {% data variables.product.prodname_secret_scanning_caps %} as a protection push is currently in beta and subject to change.
 
 {% endnote %}