Skip to content

Commit 2a5d3ec

Browse files
authored
Merge pull request #38718 from github/repo-sync
Repo sync
2 parents 214ba4a + 70e258d commit 2a5d3ec

File tree

71 files changed

+4141
-19668
lines changed

Some content is hidden

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

71 files changed

+4141
-19668
lines changed

.github/copilot-instructions.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,11 @@ Within Markdown files, with the exception of the `title` field in the metadata a
1515
| `{% data variables.code-scanning.codeql_workflow %}` | CodeQL analysis workflow | data/variables/code-scanning.yml |
1616

1717
There are many more variables. These are stored in various YAML files within the `data/variables` directory.
18+
19+
### Links to other articles
20+
21+
`[AUTOTITLE]` is the correct way to specify the title of a linked article, when that article is another page on the docs.github.com site. Do not suggest replacing the placeholder link text `[AUTOTITLE]` with the actual page title or using the `{% link %}` Liquid tag.
22+
23+
### Creating a pull request
24+
25+
When creating a pull request as a result of a request to do so in Copilot Chat, the first line of the PR description should always be the following (in italics): `_This pull request was created as a result of the following prompt in Copilot Chat._` Then, within a collapsed section, quote the original prompt from Copilot Chat.

content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-web-commit-signing.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@ If you enable web commit signing, {% data variables.product.prodname_ghe_server
2323

2424
You can enable web commit signing, rotate the private key used for web commit signing, and disable web commit signing.
2525

26+
{% ifversion ghes > 3.16 %}
27+
28+
### About persistent commit signature verification
29+
30+
Persistent commit signature verification is related but separate from web commit signing. This feature ensures that the verified status of commits is retained, even if signing keys are changed or revoked.
31+
32+
Persistent commit signature verification helps maintain long-term integrity and trust in your repository’s commit history. However, you may choose to disable it in environments where minimizing disk usage is a priority, especially for large installations with a high number of verified commits.
33+
34+
For information about disabling persistent commit signature verification, see [AUTOTITLE](/admin/configuring-settings/configuring-user-applications-for-your-enterprise/disabling-persistent-commit-verification).
35+
36+
{% endif %}
37+
2638
## Enabling web commit signing
2739

2840
{% data reusables.enterprise_site_admin_settings.create-pgp-key-web-commit-signing %}
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
title: Disabling persistent commit verification
3+
shortTitle: Disable persistent commit verification
4+
intro: 'You can disable persistent commit verification on {% data variables.product.prodname_ghe_server %} to reduce disk usage.'
5+
versions:
6+
ghes: '>=3.17'
7+
type: how_to
8+
topics:
9+
- Access management
10+
- Enterprise
11+
- Fundamentals
12+
- Identity
13+
- Security
14+
permissions: 'Site administrators'
15+
---
16+
17+
## About persistent commit verification
18+
19+
When persistent commit verification is enabled, {% data variables.product.prodname_ghe_server %} stores a verification record alongside each commit when its signature is verified. This record ensures that verified commits maintain their verification status even if signing keys are later rotated, expired, or revoked. For more information about persistent commit verification, see [AUTOTITLE](/authentication/managing-commit-signature-verification/about-commit-signature-verification#persistent-commit-signature-verification).
20+
21+
By default, persistent commit verification is enabled on {% data variables.product.prodname_ghe_server %} 3.17 and later.
22+
23+
Each verified commit requires approximately 80 bytes of storage. For large installations with a large number of verified commits (e.g., hundreds of thousands or more), you may want to disable this feature to limit data growth.
24+
25+
## Disabling persistent commit verification
26+
27+
You can disable persistent commit verification for {% data variables.location.product_location %}.
28+
29+
1. In the administrative shell, run the following command.
30+
31+
```bash copy
32+
ghe-config app.persist-commit-signature-verification.enabled false
33+
```
34+
35+
1. Apply the configuration.
36+
37+
```bash copy
38+
ghe-config-apply
39+
```
40+
41+
## Enabling persistent commit verification
42+
43+
If you previously disabled persistent commit verification, you can re-enable it.
44+
45+
1. In the administrative shell, run the following command.
46+
47+
```bash copy
48+
ghe-config app.persist-commit-signature-verification.enabled true
49+
```
50+
51+
1. Apply the configuration.
52+
53+
```bash copy
54+
ghe-config-apply
55+
```

content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ children:
1616
- /configuring-interactive-maps
1717
- /managing-github-mobile-for-your-enterprise
1818
- /verifying-or-approving-a-domain-for-your-enterprise
19+
- /disabling-persistent-commit-verification
1920
redirect_from:
2021
- /admin/configuration/configuring-user-applications-for-your-enterprise
2122
---

content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-with-okta.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,16 @@ Before starting this section, ensure you have followed steps **1 to 4** in [AUTO
120120
1. Click **Configure API integration**.
121121
1. In the "API Token" field, enter the {% data variables.product.pat_v1 %} belonging to the setup user.
122122

123-
{% data reusables.scim.import-groups-unsupported %}
123+
{% data reusables.scim.import-groups-unsupported %}
124+
125+
{% ifversion ghec %}
126+
127+
> [!IMPORTANT]
128+
> For an enterprise on {% data variables.enterprise.data_residency %} (GHE.com), please enter the following URL in the **Base URL** field: {% raw %}`https://api.{subdomain}.ghe.com/scim/v2/enterprises/{subdomain}`{% endraw %} (ensuring to replace {% raw %}`{subdomain}`{% endraw %} with your enterprise's subdomain).
129+
>
130+
> **For example**: if your enterprise's subdomain is {% raw %}`acme`{% endraw %}, the base URL would be {% raw %}`https://api.acme.ghe.com/scim/v2/enterprises/acme`{% endraw %}.
131+
132+
{% endif %}
124133

125134
1. Click **Test API Credentials**. If the test is successful, a verification message will appear at the top of the screen.
126135
1. To save the token, click **Save**.

content/admin/managing-iam/understanding-iam-for-enterprises/getting-started-with-enterprise-managed-users.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ Using an **incognito or private browsing window**:
3939
1. Enable two-factor authentication (2FA), and save the recovery codes. See [AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication).
4040

4141
> [!WARNING]
42-
> All subsequent login attempts for the setup user account will require a successful 2FA challenge response or the use of an enterprise recovery code to complete authentication. To avoid being locked out of your account, after enabling single sign-on, save your enterprise recovery codes. See [AUTOTITLE](/admin/managing-iam/managing-recovery-codes-for-your-enterprise/downloading-your-enterprise-accounts-single-sign-on-recovery-codes#downloading-codes-for-an-enterprise-with-enterprise-managed-users).
42+
> All subsequent login attempts for the setup user account will require a successful 2FA challenge response.
43+
44+
> [!IMPORTANT]
45+
> If the enterprise account has enabled single sign-on and the setup user hasn’t enabled 2FA, they must use an enterprise recovery code to authenticate. To avoid being locked out of your account, after enabling single sign-on, save your enterprise recovery codes. For more information, see [AUTOTITLE](/admin/managing-iam/managing-recovery-codes-for-your-enterprise/downloading-your-enterprise-accounts-single-sign-on-recovery-codes#downloading-codes-for-an-enterprise-with-enterprise-managed-users) and the related [changelog in our {% data variables.product.prodname_blog %}](https://github.blog/changelog/2025-01-17-setup-user-for-emu-enterprises-requires-2fa-or-use-of-a-recovery-code/).
4346
4447
{% data reusables.enterprise-accounts.emu-password-reset-session %}
4548

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/exporting-and-scraping-prometheus-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ curl -L -H "Content-Type: application/json" -X PUT -u "api_key:xxxxxxx" https://
5353
To verify that the Prometheus metrics exporter is enabled, use `curl` to query the `/metrics` endpoint on port 9103. For more information about the administrative ports, see [AUTOTITLE](/admin/configuring-settings/configuring-network-settings/network-ports#administrative-ports).
5454

5555
```shell
56-
curl localhost:9103/metrics
56+
curl 127.0.0.1:9103/metrics
5757
```
5858

5959
If successful, the response will include metrics with the `collectd_` prefix.

content/admin/upgrading-your-instance/preparing-to-upgrade/overview-of-the-upgrade-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Check if you need to upgrade the following applications:
8080
> [!NOTE]
8181
> Hotpatches require a configuration run, which can cause a brief period of errors or unresponsiveness for some or all services on {% data variables.location.product_location %}. You are not required to enable maintenance mode during installation of a hotpatch, but doing so will guarantee that users see a maintenance page instead of errors or timeouts. See [AUTOTITLE](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode).
8282
* Patch releases using an upgrade package typically require less than five minutes of downtime.
83-
* Upgrading to a new feature release that include data migrations may cause a few hours of downtime, depending on storage performance and the amount of data that is migrated. During this time none of your users will be able to use the enterprise.
83+
* Upgrading to a new feature release that includes data migrations may cause a few hours of downtime, depending on storage performance and the amount of data that is migrated. During this time none of your users will be able to use the enterprise.{% ifversion ghes > 3.16 %} You may notice that upgrades to a new feature release take less time. This is because selective database transitions will now run concurrently, with the number of concurrent workers defaulting to the number of CPU cores, up to a maximum of 16.{% endif %}
8484

8585
## Communicating your upgrade
8686

content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ Signing commits differs from signing off on a commit. For more information about
4242
| **Unverified** | The commit is signed but the signature could not be verified.
4343
| No verification status | The commit is not signed.
4444

45+
{% endif %}
46+
47+
{% ifversion fpt or ghec or ghes > 3.16 %}
48+
4549
### Persistent commit signature verification
4650

4751
Regardless of the signature choice - GPG, SSH, or S/MIME - once a commit signature is verified, it remains verified within its repository's network. See [AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories).
@@ -52,6 +56,12 @@ The verification record includes a timestamp marking when the verification was c
5256

5357
Persistent commit signature verification applies to new commits pushed to {% data variables.product.github %}. For any commits that predate this feature, a persistent record will be created the next time the commit's signature is verified on {% data variables.product.github %}, helping ensure that verified statuses remain stable and reliable across the repository's history.
5458

59+
{% ifversion ghes %}
60+
61+
For information about disabling persistent commit signature verification, see [AUTOTITLE](/admin/configuring-settings/configuring-user-applications-for-your-enterprise/disabling-persistent-commit-verification).
62+
63+
{% endif %}
64+
5565
#### Records persist even after revocation and expiration
5666

5767
Persistent commit signature verification reflects the verified state of a commit at the time of verification. This means that if a signing key is later revoked, expired, or otherwise altered, previously verified commits retain their verified status based on the record created during the initial verification. {% data variables.product.github %} will not re-verify previously signed commits or retroactively adjust their verification status in response to changes in the key's state. Organizations may need to manage key states directly to align with their security policies, especially if frequent key rotation or revocation is planned.

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ shortTitle: Migrating to new GHAS SKUs
1818

1919
## New SKUs for {% data variables.product.prodname_AS %} features
2020

21-
<!-- expires 2025-05-31 -->
21+
<!-- expires 2025-09-30 -->
2222

23-
<!-- On expiry, check with the stakeholder. If nothing else, remove the date from the start of this paragraph and check the information for Metered-billing users is still appropriate. Possibly the whole article can be deleted. Reference: release 5202 -->
23+
{% data variables.product.prodname_AS %} features are also available under two separate stock keeping units (SKUs) for {% data variables.product.prodname_team %} and {% data variables.product.prodname_ghe_cloud %} users. {% data variables.product.prodname_ghe_server %} users can use the two new SKUs when upgrading to version 3.17.
2424

25-
From April 1, 2025, {% data variables.product.prodname_AS %} features are also available under two separate stock keeping units (SKUs) for {% data variables.product.prodname_team %} and {% data variables.product.prodname_ghe_cloud %} users. {% data variables.product.prodname_ghe_server %} users can use the two new SKUs when upgrading to version 3.17.
26-
27-
<!-- end expires 2025-05-31 -->
25+
<!-- end expires 2025-09-30 -->
2826

2927
{% data reusables.advanced-security.ghas-products-bullets %}
3028

0 commit comments

Comments
 (0)