Skip to content

Commit 230da0f

Browse files
Merge branch 'main' into fix/copilot-chat-variable
2 parents 0739514 + 15adf7c commit 230da0f

File tree

533 files changed

+5405
-3263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

533 files changed

+5405
-3263
lines changed

.github/actions/install-cocofix/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ runs:
1818
npm install --no-save \
1919
'--@github:registry=https://npm.pkg.github.com' \
2020
'--//npm.pkg.github.com/:_authToken=${TOKEN}' \
21-
@github/cocofix
21+
@github/cocofix codeql-ts

.github/workflows/generate-code-scanning-query-lists.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Build code scanning query list
8989
run: |
90-
for lang in "cpp" "csharp" "go" "java" "javascript" "python" "ruby" "swift"; do
90+
for lang in "actions" "cpp" "csharp" "go" "java" "javascript" "python" "ruby" "swift"; do
9191
echo "Generating code scanning query list for $lang"
9292
npm run generate-code-scanning-query-list -- \
9393
--verbose \
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

config/kubernetes/production/deployments/webapp.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ spec:
2323
image: docs-internal
2424
resources:
2525
requests:
26-
cpu: 2000m
27-
memory: 6Gi
28-
limits:
2926
cpu: 8000m
27+
memory: 10Gi
28+
limits:
29+
cpu: 16000m
3030
memory: 16Gi
3131
ports:
3232
- name: http

config/moda/configuration/default/env.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ data:
44
NODE_OPTIONS: '--max-old-space-size=4096'
55
PORT: '4000'
66
ENABLED_LANGUAGES: 'en,es,ja,pt,zh,ru,fr,ko,de'
7-
RATE_LIMIT_MAX: '150'
7+
RATE_LIMIT_MAX: '21'
88
# Moda uses a non-default port for sending datadog metrics
99
DD_DOGSTATSD_PORT: '28125'

content/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows.md

+1
Original file line numberDiff line numberDiff line change
@@ -1033,6 +1033,7 @@ jobs:
10331033
> * Scheduled workflows will only run on the default branch.
10341034
> * In a public repository, scheduled workflows are automatically disabled when no repository activity has occurred in 60 days. For information on re-enabling a disabled workflow, see [AUTOTITLE](/[email protected]/actions/using-workflows/disabling-and-enabling-a-workflow#enabling-a-workflow).
10351035
> * For an enterprise with {% data variables.product.prodname_emus %}, scheduled workflows will not run if the last `actor` associated with the scheduled workflow has been deprovisioned (and therefore become suspended) by the {% data variables.product.prodname_emu %} identity provider (IdP). However, if the last `actor` {% data variables.product.prodname_emu %} has not been deprovisioned by the IdP, and has only been removed as a member from a given organization in the enterprise, scheduled workflows will still run with that user set as the `actor`. Similarly, for an enterprise without {% data variables.product.prodname_emus %}, removing a user from an organization will not prevent scheduled workflows which had that user as their `actor` from running. Essentially, triggering a scheduled workflow requires that the status of the `actor` user account associated with the workflow is currently active (i.e. not suspended or deleted). Thus, the _user account's_ status, in both {% data variables.product.prodname_emu %} and non-{% data variables.product.prodname_emu %} scenarios, is what's important, _not_ the user's _membership status_ in the organization where the scheduled workflow is located.
1036+
> * Certain repository events change the `actor` associated with the workflow. For example, a user who changes the default branch of the repository, which changes the branch on which scheduled workflows run, becomes `actor` for those scheduled workflows.
10361037
> * For a deactivated scheduled workflow, if a user with `write` permissions to the repository makes a commit that changes the `cron` schedule on the workflow, the workflow will be reactivated, and that user will become the `actor` associated with any workflow runs. Note that, in this situation, the workflow is not reactivated by any change to the workflow file; you must alter the `cron` value in the workflow and commit this change.
10371038
>
10381039
> **Example:**

content/admin/data-residency/about-github-enterprise-cloud-with-data-residency.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ To pay for user licenses and services, you can:
4747

4848
You will be on our latest billing platform, which allows you to estimate spending, create cost centers to manage expenses, and pay flexibly for the services you use.
4949

50-
You can also sign up for usage-based billing for {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GHAS %}{% ifversion ghas-products-cloud %} products{% endif %}, meaning you won't need to purchase a pre-defined number of licenses in advance.
50+
You can also sign up for usage-based billing for {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GHAS %} products, meaning you won't need to purchase a pre-defined number of licenses in advance.
5151

5252
## Developer experience
5353

content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,11 @@ If a policy is enabled for an enterprise, the policy can be selectively disabled
161161

162162
In the "Workflow permissions" section, you can set the **default** permissions granted to the `GITHUB_TOKEN`.
163163

164-
* **Read and write permissions:** By default, `GITHUB_TOKEN` has read and write access for all scopes.
164+
* **Read and write permissions:** The default permissions for the `GITHUB_TOKEN` depend on when the enterprise or organization was created:
165+
166+
* **Created on or after February 2, 2023** – Defaults to **read-only** access for all scopes.
167+
* **Created before February 2, 2023** – Defaults to **read and write** access for all scopes.
168+
165169
* **Read repository contents and packages permissions:** By default, `GITHUB_TOKEN` has only read access for the `contents` and `packages` scopes. The more permissive setting cannot be chosen as the default for individual organizations or repositories.
166170

167171
Anyone with write access to a repository can still modify the permissions granted to the `GITHUB_TOKEN` for a specific workflow, by editing the `permissions` key in the workflow file.

content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Before you require use of two-factor authentication, we recommend notifying orga
4141
{% data reusables.two_fa.ghes_ntp %}
4242

4343
> [!WARNING]
44-
> * When you require two-factor authentication for your enterprise, outside collaborators (including bot accounts) in all organizations owned by your enterprise who do not use 2FA will be removed from the organization and lose access to its repositories. They will also lose access to their forks of the organization's private repositories. You can reinstate their access privileges and settings if they enable 2FA for their account within three months of their removal from your organization. For more information, see [AUTOTITLE](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization).
45-
> * Any outside collaborator in any of the organizations owned by your enterprise who disables 2FA for their account after you've enabled required two-factor authentication will automatically be removed from the organization. Members and billing managers who disable 2FA will not be able to access organization resources until they re-enable it.
44+
> * When you require two-factor authentication for your enterprise, {% ifversion ghes < 3.17 %}members and {% endif %}outside collaborators (including bot accounts) in all organizations owned by your enterprise who do not use 2FA will be removed from the organization and lose access to its repositories. They will also lose access to their forks of the organization's private repositories. You can reinstate their access privileges and settings if they enable 2FA for their account within three months of their removal from your organization. For more information, see [AUTOTITLE](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization).
45+
> * Any {% ifversion ghes < 3.17 %}member or {% endif %}outside collaborator in any of the organizations owned by your enterprise who disables 2FA for their account after you've enabled required two-factor authentication will automatically be removed from the organization. Members {% ifversion fpt or ghes %}and billing managers{% endif %} who disable 2FA will not be able to access organization resources until they re-enable it.
4646
> * If you're the sole owner of an enterprise that requires two-factor authentication, you won't be able to disable 2FA for your user account without disabling required 2FA for the enterprise.
4747
4848
{% ifversion mandatory-2fa-dotcom-contributors %}
@@ -58,7 +58,7 @@ Before you require use of two-factor authentication, we recommend notifying orga
5858
1. Under "Two-factor authentication", review the information about changing the setting. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
5959
1. Under "Two-factor authentication", select **Require two-factor authentication for the enterprise and all of its organizations**, then click **Save**.
6060
1. If prompted, read the information about how user access to organization resources will be affected by a 2FA requirement. To confirm the change, click **Confirm**.
61-
1. Optionally, if any outside collaborators are removed from the organizations owned by your enterprise, we recommend sending them an invitation to reinstate their former privileges and access to your organization. Each person must enable 2FA before they can accept your invitation.
61+
1. Optionally, if any {% ifversion ghes < 3.17 %}members or {% endif %}outside collaborators are removed from the organizations owned by your enterprise, we recommend sending them an invitation to reinstate their former privileges and access to your organization. Each person must enable 2FA before they can accept your invitation.
6262

6363
{% ifversion fpt or ghec %}
6464

content/admin/installing-your-enterprise-server/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-vmware.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ shortTitle: Install on VMware
2222
## Prerequisites
2323

2424
* {% data reusables.enterprise_installation.software-license %}
25-
* You must have a VMware vSphere ESXi Hypervisor, applied to a bare metal machine that will run {% data variables.location.product_location %}s. We support versions 5.5 to 7.0. The ESXi Hypervisor is free and does not include the (optional) vCenter Server. For more information, see [the VMware ESXi documentation](https://www.vmware.com/products/esxi-and-esx.html).
26-
* You will need access to a vSphere Client. If you have vCenter Server you can use the vSphere Web Client. For more information, see the VMware guide [Log in to vCenter Server by Using the vSphere Web Client](https://docs.vmware.com/en/VMware-vSphere/6.5/com.vmware.vsphere.install.doc/GUID-CE128B59-E236-45FF-9976-D134DADC8178.html).
25+
* You must have a VMware vSphere ESXi Hypervisor, applied to a bare metal machine that will run {% data variables.location.product_location %}s. We support versions 5.5 to 8.0. The ESXi Hypervisor is free and does not include the (optional) vCenter Server. For more information, see [the VMware ESXi documentation](https://www.vmware.com/products/esxi-and-esx.html).
26+
* You will need access to a vSphere Client. If you have vCenter Server you can use the vSphere Web Client. For more information, see the VMware guide [Log in to vCenter Server by Using the vSphere Web Client](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/vcenter-server-installation-and-setup-8-0.html).
2727

2828
## Hardware considerations
2929

content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md

+12-4
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,24 @@ For more information, see [AUTOTITLE](/authentication/securing-your-account-with
2424

2525
## Requirements for enforcing two-factor authentication
2626

27-
Before you can require organization members and outside collaborators to use 2FA, you must [enable two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa) for your own personal account.
27+
Before you can require organization members and outside collaborators to use two-factor authentication, you must [enable 2FA](/authentication/securing-your-account-with-two-factor-authentication-2fa) for your own personal account.
2828

29-
Before you require use of two-factor authentication, we recommend notifying organization members and outside collaborators and asking them to set up 2FA for their accounts. You can [see if members and outside collaborators already use 2FA](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled) on an organization's People tab.
29+
Before you require use of 2FA, we recommend notifying organization members and outside collaborators and asking them to set up 2FA for their accounts. You can [see if members and outside collaborators already use 2FA](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled) on an organization's People tab.
3030

3131
{% data reusables.two_fa.ghes_ntp %}
3232

33+
{% ifversion ghes < 3.17 %}
3334
> [!WARNING]
34-
> * When you require two-factor authentication, members and outside collaborators (including bot accounts) who do not use 2FA will be removed from the organization and lose access to its repositories, including their forks of private repositories. If they enable 2FA for their personal account within three months of being removed from the organization, you can reinstate their access privileges and settings, see [AUTOTITLE](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization).
35+
> * When you require 2FA, members and outside collaborators (including bot accounts) who do not use 2FA will be removed from the organization and lose access to its repositories, including their forks of private repositories. If they enable 2FA for their personal account within three months of being removed from the organization, you can reinstate their access privileges and settings, see [AUTOTITLE](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization).
3536
> * When 2FA is required, organization members or outside collaborators who disable 2FA will automatically be removed from the organization.
36-
> * If you're the sole owner of an organization that requires two-factor authentication, you won't be able to disable 2FA for your personal account without disabling required two-factor authentication for the organization.
37+
> * If you're the sole owner of an organization that requires 2FA, you won't be able to disable 2FA for your personal account without disabling required two-factor authentication for the organization.
38+
{% else %}
39+
> [!WARNING]
40+
> * When you require 2FA, members who do not use 2FA will not be able to access your enterprise resources until they enable 2FA on their account. They will retain membership even without 2FA, including occupying seats in your enterprise and organizations.
41+
> * When your require 2FA, outside collaborators (including bot accounts) who do not use 2FA will be removed from the enterprise and its organization and lose access to repositories, including their forks of private repositories. If they enable 2FA for their personal account within three months of being removed from the organization, you can [reinstate their access privileges and settings](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization).
42+
> * When 2FA is required, outside collaborators who disable 2FA will automatically be removed from the enterprise and its organizations. Members who disable 2FA will not be able to access your enterprise and organization resources until they re-enable it.
43+
> * If you're the sole owner of an organization that requires 2FA, you won't be able to disable 2FA for your personal account without disabling required 2FA for the organization.
44+
{% endif %}
3745

3846
## Requiring two-factor authentication for an organization
3947

0 commit comments

Comments
 (0)