Skip to content

Commit 6a79da0

Browse files
authored
Merge pull request #38758 from github/repo-sync
Repo sync
2 parents 7df2d3f + fd1a891 commit 6a79da0

File tree

14 files changed

+68
-14
lines changed

14 files changed

+68
-14
lines changed

content/admin/data-residency/network-details-for-ghecom.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ You must allow:
130130

131131
### Required in Australia
132132

133-
* 20.213.236.72/29
134-
* 20.53.178.216/29
135133
* 20.213.241.72/29
136134
* 20.11.90.48/29
137135
* 20.5.34.240/28

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ You can view the current license limits and usage for your enterprise.
3636
* If you have a volume/subscription license, the number of licenses **available** to use is also displayed.
3737
* If you run out of licenses, for volume/subscription only, the section is red and reports "Limit exceeded." You should either reduce your use or purchase more licenses.
3838

39-
1. Optionally, to see a detailed breakdown of usage per organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}, in the "{% data variables.product.prodname_GHAS %}" section click **More details**.
39+
1. Optionally, to see a detailed breakdown of usage per organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}, in the "{% data variables.product.prodname_AS %}" section click **More details**.
4040

41-
In the "{% data variables.product.prodname_GHAS %}" section, you can see a summary of your current license usage, as well as the number of committers and unique committers for each organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}. The organizations{% ifversion secret-scanning-user-owned-repos %} and user namespaces{% endif %} in the billing table are sorted by the highest number of unique committers in descending order.
41+
In the "{% data variables.product.prodname_AS %}" section, you can see a summary of your current license usage, as well as the number of committers and unique committers for each organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}. The organizations{% ifversion secret-scanning-user-owned-repos %} and user namespaces{% endif %} in the billing table are sorted by the highest number of unique committers in descending order.
4242

4343
1. Optionally, to see a detailed breakdown of usage by repositories within an organization, click an organization name to display the "Global code security settings" for the organization.
4444

@@ -77,7 +77,7 @@ You can view the organization account's current license limits and usage.
7777
{% data reusables.profile.org_settings %}
7878
{% data reusables.organizations.billing_plans_or_licensing %}
7979

80-
The "{% data variables.product.prodname_GHAS %}" section shows details of the current usage.
80+
The "{% data variables.product.prodname_AS %}" section shows details of the current usage.
8181

8282
{% endif %}
8383

@@ -88,14 +88,14 @@ You can view the organization account's current license limits and usage.
8888

8989
## Downloading {% data variables.product.prodname_AS %} license usage information
9090

91-
You can download a CSV file with {% data variables.product.prodname_GHAS %} license usage information at both the {% data variables.enterprise.enterprise_and_org %} level. The CSV file contains information about each {% data variables.product.prodname_AS %} license that is in use, including:
91+
You can download a CSV file with details of paid use of {% data variables.product.prodname_GHAS %} products at both the {% data variables.enterprise.enterprise_and_org %} level. The CSV file contains information about each {% data variables.product.prodname_AS %} license that is in use, including:
9292

9393
* The username of the person using the {% data variables.product.prodname_GHAS_cs_or_sp %} license
9494
* The {% data variables.product.prodname_GH_cs_and_sp %}-enabled repositories where commits were made
9595
* The organizations{% ifversion secret-scanning-user-owned-repos %}{% ifversion ghec %} and user namespaces for {% data variables.product.prodname_emus %}{% endif %}{% endif %} that people using licenses belong to
9696
* The most recent commit dates and associated email addresses
9797

98-
You can use this information for insights into your {% data variables.product.prodname_AS %} usage, such as which members of your enterprise are using a license or how licenses are being consumed across your organizations.
98+
You can use this information for insights into your paid use of {% data variables.product.prodname_AS %}, such as which members of your enterprise are using a license or how licenses are being consumed across your organizations.
9999

100100
You can download a CSV report of license usage through the {% data variables.product.github %} user interface or the REST API.
101101

@@ -160,7 +160,7 @@ You can download a CSV report of license usage through the {% data variables.pro
160160

161161
## Using the REST API to download license and metered usage
162162

163-
You can retrieve {% data variables.product.prodname_AS %} usage information via the billing API.
163+
You can retrieve information on paid use of {% data variables.product.prodname_AS %} with the billing API.
164164

165165
{% ifversion fpt or ghec %}
166166

content/issues/planning-and-tracking-with-projects/automating-your-project/archiving-items-automatically.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Additionally, items are also marked as updated when field values in your project
3838

3939
When you enable automatic archiving for issues or pull requests, items in your project that already meet your criteria will also be archived. There may be some delay in archiving large numbers of items that already meet the criteria.
4040

41-
{% ifversion projects-single-limit %}Your project can contain up to {% data variables.projects.item_limit %} items across both active views and the archive page. Once that limit has been reached, you will need to delete items from your project to free up more space.{% else %} Projects also have a limit on the number of archived items they can contain. Your project can contain up to {% data variables.projects.archived_item_limit %} archived items.{% endif %} For more information on permanently deleting items, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/managing-items-in-your-project/archiving-items-from-your-project#deleting-items).
41+
{% ifversion projects-single-limit %}Your project can contain up to {% data variables.projects.item_limit %} items across both active views and the archive page. Once that limit has been reached, you will need to delete items from your project to free up more space.{% else %} Projects also have a limit on the number of archived items they can contain. Your project can contain up to {% data variables.projects.legacy_archived_item_limit %} archived items.{% endif %} For more information on permanently deleting items, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/managing-items-in-your-project/archiving-items-from-your-project#deleting-items).
4242

4343
## Configuring automatic archiving in your project
4444

content/issues/planning-and-tracking-with-projects/creating-projects/migrating-from-projects-classic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ allowTitleToDifferFromFilename: true
1212
---
1313

1414
> [!NOTE]
15-
> * If the project you are migrating contains more than {% data variables.projects.item_limit %} items, open issues will be prioritized followed by open pull requests and then notes. Remaining space will be used for closed issues, merged pull requested, and closed pull requests. Items that cannot be migrated due to this limit will be moved to the archive. If the archive limit of {% data variables.projects.archived_item_limit %} items is reached, additional items will not be migrated.
15+
> * If the project you are migrating contains more than {% data variables.projects.legacy_item_limit %} items, open issues will be prioritized followed by open pull requests and then notes. Remaining space will be used for closed issues, merged pull requested, and closed pull requests. Items that cannot be migrated due to this limit will be moved to the archive. If the archive limit of {% data variables.projects.legacy_archived_item_limit %} items is reached, additional items will not be migrated.
1616
> * Note cards are converted to draft issues, and the contents are saved to the body of the draft issue. If information appears to be missing, make any hidden fields visible. For more information, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view#showing-and-hiding-fields).
1717
> * Automation will not be migrated.
1818
> * Triage, archive, and activity will not be migrated.

content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ allowTitleToDifferFromFilename: true
1313
---
1414

1515
> [!NOTE]
16-
> A project can contain a maximum of {% data variables.projects.item_limit %} items {% ifversion projects-single-limit %} across both active views and the archive page{% else %}and {% data variables.projects.archived_item_limit %} archived items{% endif %}. To learn more about automatically archiving items when they meet specific criteria, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/automating-your-project/archiving-items-automatically).
16+
> A project can contain a maximum of{% ifversion projects-single-limit %} {% data variables.projects.item_limit %} items across both active views and the archive page{% else %} {% data variables.projects.legacy_item_limit %} items and {% data variables.projects.legacy_archived_item_limit %} archived items{% endif %}. To learn more about automatically archiving items when they meet specific criteria, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/automating-your-project/archiving-items-automatically).
1717
1818
## Adding issues and pull requests to a project
1919

content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/archiving-items-from-your-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ allowTitleToDifferFromFilename: true
1313
---
1414

1515
> [!NOTE]
16-
> A project can contain a maximum of {% data variables.projects.item_limit %} items {% ifversion projects-single-limit %}across both active views and archive page{% else %} and {% data variables.projects.archived_item_limit %} archived items{% endif %}.
16+
> A project can contain a maximum of{% ifversion projects-single-limit %} {% data variables.projects.item_limit %} items across both active views and the archive page{% else %} {% data variables.projects.legacy_item_limit %} items and {% data variables.projects.legacy_archived_item_limit %} archived items{% endif %}.
1717
1818
## Archiving items
1919

data/variables/projects.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ project_v2_and_v1: '{% data variables.projects.project_v2 %}{% ifversion project
2020
projects_v2_and_v1_if_create: '{% data variables.projects.projects_v2 %}{% ifversion projects-v1-can-create %} and {% data variables.projects.projects_v1_boards %}{% endif %}'
2121

2222
# Limits
23+
legacy_item_limit: '1,200'
2324
item_limit: '50,000'
24-
archived_item_limit: '10,000'
25+
legacy_archived_item_limit: '10,000'
2526
issue_type_limit: '25'
2627
sub-issue_limit: '100'
2728

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3299,6 +3299,16 @@
32993299
"description": "A request to bypass secret scanning push protection was approved by a user.",
33003300
"docs_reference_links": "/code-security/secret-scanning/push-protection-for-repositories-and-organizations#managing-requests-to-bypass-push-protection"
33013301
},
3302+
{
3303+
"action": "secret_scanning_push_protection_request.cancel",
3304+
"description": "A user canceled a request to bypass secret scanning push protection.",
3305+
"docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line"
3306+
},
3307+
{
3308+
"action": "secret_scanning_push_protection_request.complete",
3309+
"description": "A user pushed a commit containing a secret for which there is an approved secret scanning push protection bypass request.",
3310+
"docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line"
3311+
},
33023312
{
33033313
"action": "secret_scanning_push_protection_request.deny",
33043314
"description": "A request to bypass secret scanning push protection was denied by a user.",

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,16 @@
349349
"description": "The trial of GitHub Enterprise Cloud expired.",
350350
"docs_reference_links": "/admin/overview/setting-up-a-trial-of-github-enterprise-cloud"
351351
},
352+
{
353+
"action": "business.github_models_billing_disabled",
354+
"description": "GitHub Models billing was disabled for the business.",
355+
"docs_reference_links": "N/A"
356+
},
357+
{
358+
"action": "business.github_models_billing_enabled",
359+
"description": "GitHub Models billing was enabled for the business.",
360+
"docs_reference_links": "N/A"
361+
},
352362
{
353363
"action": "business.import_license_usage",
354364
"description": "License usage information was imported from a GitHub Enterprise Server instance to an enterprise account on GitHub.com.",
@@ -4039,6 +4049,16 @@
40394049
"description": "A request to bypass secret scanning push protection was approved by a user.",
40404050
"docs_reference_links": "/code-security/secret-scanning/push-protection-for-repositories-and-organizations#managing-requests-to-bypass-push-protection"
40414051
},
4052+
{
4053+
"action": "secret_scanning_push_protection_request.cancel",
4054+
"description": "A user canceled a request to bypass secret scanning push protection.",
4055+
"docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line"
4056+
},
4057+
{
4058+
"action": "secret_scanning_push_protection_request.complete",
4059+
"description": "A user pushed a commit containing a secret for which there is an approved secret scanning push protection bypass request.",
4060+
"docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line"
4061+
},
40424062
{
40434063
"action": "secret_scanning_push_protection_request.deny",
40444064
"description": "A request to bypass secret scanning push protection was denied by a user.",

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3299,6 +3299,16 @@
32993299
"description": "A request to bypass secret scanning push protection was approved by a user.",
33003300
"docs_reference_links": "/code-security/secret-scanning/push-protection-for-repositories-and-organizations#managing-requests-to-bypass-push-protection"
33013301
},
3302+
{
3303+
"action": "secret_scanning_push_protection_request.cancel",
3304+
"description": "A user canceled a request to bypass secret scanning push protection.",
3305+
"docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line"
3306+
},
3307+
{
3308+
"action": "secret_scanning_push_protection_request.complete",
3309+
"description": "A user pushed a commit containing a secret for which there is an approved secret scanning push protection bypass request.",
3310+
"docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line"
3311+
},
33023312
{
33033313
"action": "secret_scanning_push_protection_request.deny",
33043314
"description": "A request to bypass secret scanning push protection was denied by a user.",

src/audit-logs/data/ghes-3.17/enterprise.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,11 @@
599599
"description": "N/A",
600600
"docs_reference_links": "N/A"
601601
},
602+
{
603+
"action": "copilot.user_access_revoked",
604+
"description": "N/A",
605+
"docs_reference_links": "N/A"
606+
},
602607
{
603608
"action": "custom_hosted_runner.create",
604609
"description": "N/A",

src/audit-logs/data/ghes-3.17/organization.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,11 @@
309309
"description": "N/A",
310310
"docs_reference_links": "N/A"
311311
},
312+
{
313+
"action": "copilot.user_access_revoked",
314+
"description": "N/A",
315+
"docs_reference_links": "N/A"
316+
},
312317
{
313318
"action": "custom_hosted_runner.create",
314319
"description": "N/A",

src/audit-logs/data/ghes-3.17/user.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,11 @@
209209
"description": "N/A",
210210
"docs_reference_links": "N/A"
211211
},
212+
{
213+
"action": "copilot.user_access_revoked",
214+
"description": "N/A",
215+
"docs_reference_links": "N/A"
216+
},
212217
{
213218
"action": "custom_hosted_runner.create",
214219
"description": "N/A",

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": "e14b4ba692f0019ca81fd2843ae8445239cf480e"
6+
"sha": "a44fbc883ed2e0f27e21ba9a5d5f3859f77d3b74"
77
}

0 commit comments

Comments
 (0)