Skip to content

Commit c9e1b54

Browse files
docs-botdocs-bot
authored
Merge pull request #38931 from github/repo-sync
Repo sync
2 parents 6dc19a4 + de302ca commit c9e1b54

File tree

8 files changed

+189
-159
lines changed

8 files changed

+189
-159
lines changed

‎assets/images/help/copilot/copilot-immersive-button.png

-21.4 KB
Binary file not shown.

‎data/reusables/billing/license-models.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
{% rowheaders %}
44

5-
| License model | GHE (Metered) | GHE (Volume/subscription) |
6-
|----------------------------------|-------------------------------------|------------------------------------|
7-
| **Billing type** | Usage-based | Volume-based |
8-
| **Cloud vs. Server** | Cloud-first, with a Server use right for Cloud users | 1 user license covers both Cloud and Server (hybrid, Cloud-only, or Server-only) |
9-
| **Setup** | Self-service | Manual setup via {% data variables.product.github %} Sales |
10-
| **Server license generation** | Users generate their own {% data variables.product.prodname_enterprise %} Server license | License file provided by {% data variables.product.github %} Sales |
11-
| **License file scope** | Covers Cloud-assigned users at time of generation | Covers all purchased users for both Cloud and Server |
12-
| **License expiration** | Expires in 12 months | Aligned with volume license term |
13-
| **License key usage** | Limits max Server users | Covers all users in the volume subscription |
14-
| **Required {% data variables.product.prodname_enterprise %} version** | {% data variables.product.prodname_enterprise %} 3.13+, with {% data variables.product.prodname_github_connect %} | No specific version required |
15-
| **Billing model** | Invoiced for users not assigned on Cloud via {% data variables.product.prodname_github_connect %} | Fixed cost based on purchased volume |
5+
| License model | GHE (Metered) | GHE (Volume/subscription) |
6+
|----------------------------------|-------------------------------------|-----------------------------------------------------------------------------------------------|
7+
| **Billing type** | Usage-based | Volume-based |
8+
| **Cloud vs. Server** | Cloud-first, with a Server use right for Cloud users | 1 user license covers both Cloud and Server (hybrid, Cloud-only, or Server-only) |
9+
| **Setup** | Self-service | Manual setup via {% data variables.product.github %} Sales |
10+
| **Server license generation** | Users generate their own {% data variables.product.prodname_ghe_server %} license | Enterprise owners download their own {% data variables.product.prodname_ghe_server %} license |
11+
| **License file scope** | Covers Cloud-assigned users at time of generation | Covers all purchased users for both Cloud and Server |
12+
| **License expiration** | Expires in 12 months | Aligned with volume license term |
13+
| **License key usage** | Limits max Server users | Covers all users in the volume subscription |
14+
| **Required {% data variables.product.prodname_enterprise %} version** | {% data variables.product.prodname_enterprise %} 3.13+, with {% data variables.product.prodname_github_connect %} | No specific version required |
15+
| **Billing model** | Invoiced for users not assigned on Cloud via {% data variables.product.prodname_github_connect %} | Fixed cost based on purchased volume |
1616

1717
{% endrowheaders %}

‎src/audit-logs/data/fpt/organization.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,11 @@
11391139
"description": "Autofix for third party tools for code scanning alerts was enabled for an organization.",
11401140
"docs_reference_links": "N/A"
11411141
},
1142+
{
1143+
"action": "org_code_security_metered_usage.lock",
1144+
"description": "Enablement for Code Security features on new repositories has been locked for this organization.",
1145+
"docs_reference_links": "N/A"
1146+
},
11421147
{
11431148
"action": "org.codeql_disabled",
11441149
"description": "Code scanning using the default setup was disabled for an organization.",
@@ -1559,6 +1564,11 @@
15591564
"description": "The visibility of a self-hosted runner group was updated via the REST API.",
15601565
"docs_reference_links": "/rest/actions#update-a-self-hosted-runner-group-for-an-organization"
15611566
},
1567+
{
1568+
"action": "org_secret_protection_metered_usage.lock",
1569+
"description": "Enablement for Secret Protection features on new repositories has been locked for this organization.",
1570+
"docs_reference_links": "N/A"
1571+
},
15621572
{
15631573
"action": "org_secret_scanning_automatic_validity_checks.disabled",
15641574
"description": "Automatic partner validation checks have been disabled at the organization level",

‎src/audit-logs/data/ghec/enterprise.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,11 @@
239239
"description": "The policy for Code Security enablement was updated for an enterprise.",
240240
"docs_reference_links": "/code-security/getting-started/github-security-features#available-with-github-code-security"
241241
},
242+
{
243+
"action": "business_code_security_metered_usage.lock",
244+
"description": "Enablement for Code Security features on new repositories has been locked for this enterprise.",
245+
"docs_reference_links": "N/A"
246+
},
242247
{
243248
"action": "business.connect_usage_metrics_export",
244249
"description": "Server statistics were exported for the enterprise.",
@@ -484,6 +489,11 @@
484489
"description": "The SAML single sign-on session for a member in an enterprise was revoked.",
485490
"docs_reference_links": "N/A"
486491
},
492+
{
493+
"action": "business_secret_protection_metered_usage.lock",
494+
"description": "Enablement for Secret Protection features on new repositories has been locked for this enterprise.",
495+
"docs_reference_links": "N/A"
496+
},
487497
{
488498
"action": "business_secret_scanning_automatic_validity_checks.disabled",
489499
"description": "Automatic partner validation checks have been disabled at the business level",

‎src/audit-logs/data/ghec/organization.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,11 @@
11391139
"description": "Autofix for third party tools for code scanning alerts was enabled for an organization.",
11401140
"docs_reference_links": "N/A"
11411141
},
1142+
{
1143+
"action": "org_code_security_metered_usage.lock",
1144+
"description": "Enablement for Code Security features on new repositories has been locked for this organization.",
1145+
"docs_reference_links": "N/A"
1146+
},
11421147
{
11431148
"action": "org.codeql_disabled",
11441149
"description": "Code scanning using the default setup was disabled for an organization.",
@@ -1559,6 +1564,11 @@
15591564
"description": "The visibility of a self-hosted runner group was updated via the REST API.",
15601565
"docs_reference_links": "/rest/actions#update-a-self-hosted-runner-group-for-an-organization"
15611566
},
1567+
{
1568+
"action": "org_secret_protection_metered_usage.lock",
1569+
"description": "Enablement for Secret Protection features on new repositories has been locked for this organization.",
1570+
"docs_reference_links": "N/A"
1571+
},
15621572
{
15631573
"action": "org_secret_scanning_automatic_validity_checks.disabled",
15641574
"description": "Automatic partner validation checks have been disabled at the organization level",

‎src/audit-logs/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
44
"apiRequestEvent": "This event is only available via audit log streaming."
55
},
6-
"sha": "7c13aba1010feac7135f27462576e6b0188427a9"
6+
"sha": "bce8d9394f9f4e9dcd9d1661a53735ddebc8bd8c"
77
}

‎src/rest/data/ghec-2022-11-28/schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13212,13 +13212,13 @@
1321213212
}
1321313213
],
1321413214
"previews": [],
13215+
"descriptionHTML": "<p>Deletes a secret in an environment using the secret name.</p>\n<p>Authenticated users must have collaborator access to a repository to create, update, or read secrets.</p>\n<p>OAuth tokens and personal access tokens (classic) need the <code>repo</code> scope to use this endpoint.</p>",
1321513216
"statusCodes": [
1321613217
{
1321713218
"httpStatusCode": "204",
1321813219
"description": "<p>Default response</p>"
1321913220
}
13220-
],
13221-
"descriptionHTML": "<p>Deletes a secret in an environment using the secret name.</p>\n<p>Authenticated users must have collaborator access to a repository to create, update, or read secrets.</p>\n<p>OAuth tokens and personal access tokens (classic) need the <code>repo</code> scope to use this endpoint.</p>"
13221+
]
1322213222
}
1322313223
],
1322413224
"self-hosted-runner-groups": [

0 commit comments

Comments
 (0)