Merge branch 'main' into patch-1

.github/actions/cache-nextjs/action.yml

@@ -8,7 +8,7 @@ runs:
   using: 'composite'
   steps:
     - name: Cache .next/cache
-      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache@v4
       with:
         path: ${{ github.workspace }}/.next/cache
         # Generate a new cache whenever packages or source files change.

.github/actions/node-npm-setup/action.yml

@@ -6,7 +6,7 @@ runs:
   using: 'composite'
   steps:
     - name: Cache node_modules
-      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache@v4
       id: cache-node_modules
       env:
         # Default is 10 min, per segment, but we can make it much smaller

.github/actions/precompute-pageinfo/action.yml

@@ -17,8 +17,7 @@ runs:
     # Optionally, you can have it just do A (and not B and C).
 
     - name: Cache .pageinfo-cache.json.br (restore)
-      # You can't use a SHA on these. Only possible with `actions/cache@SHA...`
-      uses: actions/cache/restore@v3
+      uses: actions/cache/restore@v4
       with:
         path: .pageinfo-cache.json.br
         key: pageinfo-cache-
@@ -40,7 +39,7 @@ runs:
 
     - name: Cache .remotejson-cache (save)
       if: ${{ inputs.restore-only == '' }}
-      uses: actions/cache/save@v3
+      uses: actions/cache/save@v4
       with:
         path: .pageinfo-cache.json.br
         key: pageinfo-cache-${{ github.sha }}

.github/actions/setup-elasticsearch/action.yml

@@ -19,7 +19,7 @@ runs:
     # Cache the elasticsearch image to prevent Docker Hub rate limiting
     - name: Cache Docker layers
       id: cache-docker-layers
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: /tmp/docker-cache
         key: ${{ runner.os }}-elasticsearch-${{ inputs.elasticsearch_version }}

.github/actions/warmup-remotejson-cache/action.yml

@@ -14,8 +14,7 @@ runs:
     # You "wrap" the step that appends to disk and it will possibly retrieve
     # some from the cache, then save it when it's got more in it.
     - name: Cache .remotejson-cache (restore)
-      # You can't use a SHA on these. Only possible with `actions/cache@SHA...`
-      uses: actions/cache/restore@v3
+      uses: actions/cache/restore@v4
       with:
         path: .remotejson-cache
         key: remotejson-cache-
@@ -37,7 +36,7 @@ runs:
 
     - name: Cache .remotejson-cache (save)
       if: ${{ inputs.restore-only == '' }}
-      uses: actions/cache/save@v3
+      uses: actions/cache/save@v4
       with:
         path: .remotejson-cache
         key: remotejson-cache-${{ github.sha }}

.github/workflows/link-check-daily.yml

@@ -49,7 +49,7 @@ jobs:
         run: src/early-access/scripts/merge-early-access.sh
 
       - name: Restore disk-cache file for external link checking
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+        uses: actions/cache@v4
         with:
           path: external-link-checker-db.json
           key: external-link-checker-${{ hashFiles('src/links/scripts/rendered-content-link-checker.ts') }}

config/moda/deployment.yaml

@@ -23,13 +23,9 @@ pipelines:
     stages:
       - name: full_production
         kind: deployment
-        start_message: We are now going to deploy {{app}}/{{ref}}! Please pause or cancel the pipeline after the deploy if you want more time before auto-merging your pull request(s).
         config:
           environment: production
           timeout: 1200
-        # gates:
-        #   - kind: timer
-        #     duration: 1200
 
 notifications:
   slack_channels:

content/admin/configuring-settings/hardening-security-for-your-enterprise/restricting-access-to-githubcom-using-a-corporate-proxy.md

@@ -17,10 +17,7 @@ This feature requires an external firewall or proxy. {% data variables.contact.g
 
 ## Requesting access
 
-This feature is not enabled by default, and is currently only available to enterprises that pay by invoice.
-
-* If you pay by invoice, to request access, contact your account manager in {% data variables.product.github %}'s Sales team.
-* If you pay via credit card or PayPal, this feature is currently unavailable.
+This feature is not enabled by default. To request access, contact your account manager in {% data variables.product.github %}'s Sales team or [sign up here](https://github.com/features/preview/enterprise-access-restrictions).
 
 ## Prerequisites
 
@@ -30,7 +27,7 @@ This feature is not enabled by default, and is currently only available to enter
 * To enforce the restriction, all traffic must flow through a proxy or firewall. The proxy or firewall must:
   * Be capable of intercepting and editing traffic, commonly called a "break and inspect" proxy
   * Support arbitrary header injection
-* Your account team at {% data variables.product.company_short %} must have granted you access to this feature.
+* {% data variables.product.company_short %} must have granted you access to this feature.
 
 ## Finding the header
 

content/admin/copilot-business-only/setting-up-a-dedicated-enterprise-for-copilot-business-managed-users.md

@@ -53,9 +53,9 @@ After you configure authentication and provisioning with your IdP, grant one or
 
 You can also grant the billing manager role. A billing manager can view the assigned licenses for an enterprise, but cannot assign licenses or manage enterprise teams.
 
-## Linking an Azure subscription
+## Adding a payment method
 
-{% data reusables.copilot-business-for-non-ghe.link-azure-subscription %}
+{% data reusables.copilot-business-for-non-ghe.add-payment-method %}
 
 ## Enabling {% data variables.product.prodname_copilot_short %} for the enterprise
 

content/admin/copilot-business-only/setting-up-a-dedicated-enterprise-for-copilot-business-personal-accounts.md

@@ -44,9 +44,9 @@ You can also invite a user as a billing manager. A billing manager can view the
 
 You can configure SAML single sign-on to require users to authenticate to an external identity management system in addition to their personal account. See [AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise).
 
-## Linking an Azure subscription
+## Adding a payment method
 
-{% data reusables.copilot-business-for-non-ghe.link-azure-subscription %}
+{% data reusables.copilot-business-for-non-ghe.add-payment-method %}
 
 ## Enabling {% data variables.product.prodname_copilot_short %} for the enterprise
 

content/billing/using-the-new-billing-platform/estimating-spending.md

@@ -42,9 +42,9 @@ On this page, you can view your usage in the following categories:
    To view a different time period, select **Time Frame**, then choose a time period. You can also download an image or CSV of the graph by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} on the right.
 
 {% ifversion fpt %}
-* **By repository:** The card under the graph shows the top five repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage.
+* **By repository:** The card under the graph shows the top five repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage, including a break down by gross usage verse billable usage (minus any discounts that may apply).
 {% elsif ghec %}
-* **By organization** and **by repository:** The two cards under the graph show the top five organizations and repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage.
+* **By organization** and **by repository:** The two cards under the graph show the top five organizations and repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage, including a break down by gross usage verse billable usage (minus any discounts that may apply).
 {% endif %}
 * **By products:** You can use the product tabs to view usage and discounts for different products.
 

content/rest/index.md

@@ -86,7 +86,6 @@ children:
   - /search
   - /secret-scanning
   - /security-advisories
-  - /settings
   - /teams
   - /users
 autogenerated: rest

content/rest/orgs/index.md

@@ -21,6 +21,7 @@ children:
   - /custom-properties
   - /custom-roles
   - /members
+  - /network-configurations
   - /organization-roles
   - /orgs
   - /outside-collaborators

content/rest/settings/network-configurations.md → content/rest/orgs/network-configurations.md

@@ -1,12 +1,15 @@
 ---
 title: REST API endpoints for network configurations
 shortTitle: Network configurations
-intro: Use the REST API to interact with network configurations.
+intro: REST API endpoints for network configurations
 versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghec: '*'
 topics:
   - API
+redirect_from:
+  - /rest/settings/network-configurations
+  - /rest/settings
 autogenerated: rest
 allowTitleToDifferFromFilename: true
 ---

data/reusables/copilot-business-for-non-ghe/link-azure-subscription.md → data/reusables/copilot-business-for-non-ghe/add-payment-method.md

@@ -1,4 +1,12 @@
-To pay for licenses, you must connect your enterprise to an Azure subscription. For instructions, read the following sections in the "Connecting an Azure subscription" article:
+You must add the payment method that you agreed with {% data variables.product.github %} Sales when you requested the enterprise account.
+
+### Adding a credit card
+
+To add a credit card, go to your enterprise's "Payment information" page. See [AUTOTITLE](/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information#viewing-payment-information).
+
+### Adding an Azure subscription
+
+For instructions, read the following sections in the "Connecting an Azure subscription" article:
 
 * [Prerequisites](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#prerequisites)
 * [Connecting your Azure subscription to an enterprise account](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account)

data/reusables/copilot-business-for-non-ghe/prerequisites.md

@@ -1,2 +1,2 @@
-* To pay for licenses, you will need a **Microsoft Azure subscription**, which you will connect to your enterprise account.
+* To pay for licenses, you will need to add either a **credit card** or a **Microsoft Azure subscription** to your enterprise account. You will agree a payment method with {% data variables.product.github %} Sales when you request the enterprise account.
 * Before you enable {% data variables.product.prodname_copilot_short %}, ensure you have reviewed the [{% data variables.product.prodname_copilot %} Product Specific Terms](https://github.com/customer-terms/github-copilot-product-specific-terms).

data/variables/product.yml

@@ -97,7 +97,7 @@ prodname_codeql_cli: 'CodeQL CLI'
 # CodeQL usually bumps its minor version for each minor version of GHES.
 # Update this whenever a new enterprise version of CodeQL is being prepared.
 codeql_cli_ghes_recommended_version: >-
-  {% ifversion ghes < 3.11 %}2.13.5{% elsif ghes < 3.12 %}2.14.6{% elsif ghes < 3.16 %}2.20.2{% endif %}
+  {% ifversion ghes < 3.11 %}2.13.5{% elsif ghes < 3.12 %}2.14.6{% elsif ghes < 3.16 %}2.20.3{% endif %}
 
 # Projects v2
 prodname_projects_v2: 'Projects'