Merge branch 'main' into secret-scanning-ga

Author: mchammer01

.github/workflows/first-responder-docs-content.yml

@@ -36,7 +36,7 @@ jobs:
               issue_number: issueNumber
             })
             const teamMembers = await github.request(
-              `/orgs/github/teams/docs/members`
+              `/orgs/github/teams/docs/members?per_page=100`
             )
             const logins = teamMembers.data.map(member => member.login)
             // ignore PRs opened by docs bot accounts

.github/workflows/move-ready-to-merge-issues.yaml

@@ -5,7 +5,7 @@ name: Move and unlabel ready to merge issues
 # **Who does it impact**: Open source contributors, open-source maintainers.
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - labeled
 

.github/workflows/openapi-decorate.yml

@@ -7,7 +7,6 @@ name: OpenAPI generate decorated schema files
 on:
   workflow_dispatch:
   pull_request:
-    types: [opened]
 
 jobs:
   generate-decorated-files:

.github/workflows/triage-pull-requests.yml

@@ -5,7 +5,7 @@ name: Triage new pull requests
 # **Who does it impact**:
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - reopened
       - opened

.github/workflows/triage-stale-check.yml

@@ -21,7 +21,7 @@ jobs:
           days-before-pr-stale: 7
           days-before-pr-close: 3
           stale-pr-label: 'stale'
-          exempt-pr-labels: 'waiting for review'
+          exempt-pr-labels: 'waiting for review,never-stale'
   stale_staff:
     if: github.repository == 'github/docs'
     runs-on: ubuntu-latest
@@ -40,3 +40,4 @@ jobs:
           # a comment being posted every 14 days as an infinite loop, which is what
           # we want
           stale-pr-label: 'waiting for review'
+          exempt-pr-labels: 'never-stale'

.pa11yci

@@ -13,17 +13,16 @@
     "http://localhost:4001/en/actions",
     "http://localhost:4001/en/github/authenticating-to-github/creating-a-personal-access-token",
     "http://localhost:4001/en/github/authenticating-to-github/checking-for-existing-ssh-keys",
-    "http://localhost:4001/en/github/using-git/changing-a-remotes-url",
+    "http://localhost:4001/en/github/getting-started-with-github/managing-remote-repositories",
     "http://localhost:4001/en/github/getting-started-with-github/set-up-git",
     "http://localhost:4001/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository",
     "http://localhost:4001/en/github/writing-on-github/basic-writing-and-formatting-syntax",
     "http://localhost:4001/en/actions/reference/workflow-syntax-for-github-actions",
-    "http://localhost:4001/en/github/using-git/which-remote-url-should-i-use",
+    "http://localhost:4001/en/github/getting-started-with-github/about-remote-repositories",
     "http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line",
-    "http://localhost:4001/en/github/using-git/setting-your-username-in-git",
+    "http://localhost:4001/en/github/getting-started-with-github/setting-your-username-in-git",
     "http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address",
     "http://localhost:4001/en/github/authenticating-to-github/configuring-two-factor-authentication",
-    "http://localhost:4001/en/github/using-git/adding-a-remote",
     "http://localhost:4001/en/rest",
     "http://localhost:4001/en/github/working-with-github-pages/configuring-a-custom-domain-for-your-github-pages-site",
     "http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests",
@@ -55,7 +54,7 @@
     "http://localhost:4001/en/actions/getting-started-with-github-actions",
     "http://localhost:4001/en/actions/reference/events-that-trigger-workflows",
     "http://localhost:4001/en/desktop/getting-started-with-github-desktop/installing-github-desktop",
-    "http://localhost:4001/en/github/using-git/ignoring-files",
+    "http://localhost:4001/en/github/getting-started-with-github/ignoring-files",
     "http://localhost:4001/en/desktop",
     "http://localhost:4001/en/packages",
     "http://localhost:4001/en/actions/configuring-and-managing-workflows/configuring-a-workflow",
@@ -71,7 +70,7 @@
     "http://localhost:4001/en/actions/reference/context-and-expression-syntax-for-github-actions",
     "http://localhost:4001/en/github/managing-files-in-a-repository/navigating-code-on-github",
     "http://localhost:4001/en/github/teaching-and-learning-with-github-education/applying-for-a-student-developer-pack",
-    "http://localhost:4001/en/github/using-git/caching-your-github-credentials-in-git",
+    "http://localhost:4001/en/github/getting-started-with-github/caching-your-github-credentials-in-git",
     "http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request",
     "http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository",
     "http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/changing-your-github-username",
@@ -81,7 +80,6 @@
     "http://localhost:4001/en/actions/configuring-and-managing-workflows/using-environment-variables",
     "http://localhost:4001/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets",
     "http://localhost:4001/en/github/authenticating-to-github/removing-sensitive-data-from-a-repository",
-    "http://localhost:4001/en/github/using-git/removing-a-remote",
     "http://localhost:4001/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line",
     "http://localhost:4001/en/github/setting-up-and-managing-billing-and-payments-on-github/setting-your-billing-email",
     "http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account",
@@ -90,8 +88,8 @@
     "http://localhost:4001/en/github/authenticating-to-github/about-two-factor-authentication",
     "http://localhost:4001/en/github/working-with-github-pages/about-custom-domains-and-github-pages",
     "http://localhost:4001/en/github/searching-for-information-on-github/searching-code",
-    "http://localhost:4001/en/github/using-git/configuring-git-to-handle-line-endings",
-    "http://localhost:4001/en/github/using-git/getting-changes-from-a-remote-repository",
+    "http://localhost:4001/en/github/getting-started-with-github/configuring-git-to-handle-line-endings",
+    "http://localhost:4001/en/github/getting-started-with-github/getting-changes-from-a-remote-repository",
     "http://localhost:4001/en/github/authenticating-to-github/generating-a-new-gpg-key",
     "http://localhost:4001/en/github/authenticating-to-github/accessing-github-using-two-factor-authentication",
     "http://localhost:4001/en/github/creating-cloning-and-archiving-repositories/licensing-a-repository",

content/actions/managing-workflow-runs/reviewing-deployments.md

@@ -15,7 +15,7 @@ versions:
 
 Jobs that reference an environment configured with required reviewers will wait for an approval before starting. While a job is awaiting approval, it has a status of "Waiting". If a job is not approved within 30 days, the workflow run will be automatically canceled.
 
-For more information about environments and required approvals, see "[Environments](/actions/reference/environments)." For information about how to review deployments with the REST API, see "[Workflow Runs](/rest/reference/actions#workflow-runs)."
+For more information about environments and required approvals, see "[Environments](/actions/reference/environments)."{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %} For information about how to review deployments with the REST API, see "[Workflow Runs](/rest/reference/actions#workflow-runs)."{% endif %}
 
 ### Approving or rejecting a job
 

content/actions/reference/environments.md

@@ -21,7 +21,7 @@ Environment protection rules and environment secrets are only available on publi
 
 #### Environment protection rules
 
-Environment protection rules require specific conditions to pass before a job referencing the environment can proceed. You can use environment protection rules to require a manual approval, delay a job, or restrict the environment to certain branches.
+Environment protection rules require specific conditions to pass before a job referencing the environment can proceed. {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}You can use environment protection rules to require a manual approval, delay a job, or restrict the environment to certain branches.{% else %}You can use environment protection rules to require a manual approval or delay a job.{% endif %}
 
 ##### Required reviewers
 
@@ -33,6 +33,7 @@ For more information on reviewing jobs that reference an environment with requir
 
 Use a wait timer to delay a job for a specific amount of time after the job is initially triggered. The time (in minutes) must be an integer between 0 and 43,200 (30 days).
 
+{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}
 ##### Deployment branches
 
 Use deployment branches to restrict which branches can deploy to the environment. Below are the options for deployment branches for an environment:
@@ -42,7 +43,7 @@ Use deployment branches to restrict which branches can deploy to the environment
 * **Selected branches**: Only branches that match your specified name patterns can deploy to the environment.
 
   For example, if you specify `releases/*` as a deployment branch rule, only branches whose name begins with `releases/` can deploy to the environment. (Wildcard characters will not match `/`. To match branches that begin with `release/` and contain an additional single slash, use `release/*/*`.) If you add `main` as a deployment branch rule, a branch named `main` can also deploy to the environment. For more information about syntax options for deployment branches, see the [Ruby File.fnmatch documentation](https://ruby-doc.org/core-2.5.1/File.html#method-c-fnmatch).
-
+{% endif %}
 #### Environment secrets
 
 Secrets stored in an environment are only available to workflow jobs that reference the environment. If the environment requires approval, a job cannot access environment secrets until one of the required reviewers approves it. For more information about secrets, see "[Encrypted secrets](/actions/reference/encrypted-secrets)."
@@ -58,7 +59,7 @@ Secrets stored in an environment are only available to workflow jobs that refere
 1. Enter a name for the environment, then click **Configure environment**. Environment names are not case sensitive. An environment name may not exceed 255 characters and must be unique within the repository.
 1. Configure any environment protection rules or environment secrets.
 
-You can also create and configure environments through the REST API. For more information, see "[Environments](/rest/reference/repos#environments)" and "[Secrets](/rest/reference/actions#secrets)."
+{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}You can also create and configure environments through the REST API. For more information, see "[Environments](/rest/reference/repos#environments)" and "[Secrets](/rest/reference/actions#secrets)."{% endif %}
 
 Running a workflow that references an environment that does not exist will create an environment with the referenced name. The newly created environment will not have any protection rules or secrets configured. Anyone that can edit workflows in the repository can create environments via a workflow file, but only repository admins can configure the environment.
 
@@ -82,4 +83,4 @@ Deleting an environment will delete all secrets and protection rules associated
 1. Next the the environment that you want to delete, click {% octicon "trashcan" aria-label="The trashcan icon" %}.
 2. Click **I understand, delete this environment**.
 
-You can also delete environments through the REST API. For more information, see "[Environments](/rest/reference/repos#environments)."
+{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}You can also delete environments through the REST API. For more information, see "[Environments](/rest/reference/repos#environments)."{% endif %}

content/desktop/contributing-and-collaborating-using-github-desktop/cloning-and-forking-repositories-from-github-desktop.md

@@ -44,4 +44,4 @@ You can change how a fork behaves with the upstream repository in {% data variab
 {% data reusables.desktop.select-fork-behavior %}
 
 ### Further reading
-- [About remote repositories](/github/using-git/about-remote-repositories)
+- [About remote repositories](/github/getting-started-with-github/about-remote-repositories)

content/desktop/contributing-and-collaborating-using-github-desktop/syncing-your-branch.md

@@ -15,7 +15,7 @@ When you pull to your local branch, you only update your local copy of the repos
 
 To add changes from one branch to another branch, you can merge the branches. To apply changes to your branch from another branch in the same repository, you can merge the other branch into your branch on {% data variables.product.prodname_desktop %}. To request that changes from your branch are merged into another branch, in the same repository or in another repository in the network, you can create a pull request on {% data variables.product.prodname_desktop %}. For more information, see "[Merging another branch into your project branch](#merging-another-branch-into-your-project-branch)" and "[About pull requests](/github/collaborating-with-issues-and-pull-requests/about-pull-requests)."
 
-Some workflows require or benefit from rebasing instead of merging. By rebasing you can reorder, edit, or squash commits together. For more information, see "[About Git rebase](/articles/about-git-rebase)" and "[Rebasing your project branch onto another branch](#rebasing-your-project-branch-onto-another-branch)."
+Some workflows require or benefit from rebasing instead of merging. By rebasing you can reorder, edit, or squash commits together. For more information, see "[About Git rebase](/github/getting-started-with-github/about-git-rebase)" and "[Rebasing your project branch onto another branch](#rebasing-your-project-branch-onto-another-branch)."
 
 ### Pulling to your local branch from the remote