Skip to content

Commit 555b529

Browse files
authored
Merge pull request #38926 from github/repo-sync
Repo sync
2 parents f1bbd02 + ef554b5 commit 555b529

File tree

18 files changed

+54
-38
lines changed

18 files changed

+54
-38
lines changed

.github/workflows/first-responder-v2-prs-collect.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
runs-on: ubuntu-latest
2424

2525
steps:
26+
- name: Checkout repository
27+
uses: actions/checkout@v3
28+
2629
- name: Check if the event originated from a team member
2730
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0
2831
id: check-membership

content/copilot/about-github-copilot/plans-for-github-copilot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ redirect_from:
1010
- /copilot/about-github-copilot/subscription-plans-for-github-copilot
1111
---
1212

13-
<!-- expires 2025-06-11 -->
13+
<!-- expires 2025-06-18 -->
1414
{% data reusables.copilot.unlimited-premium-requests %}
15-
<!-- end expires 2025-06-11 -->
15+
<!-- end expires 2025-06-18 -->
1616

1717
{% data variables.product.company_short %} offers several plans for {% data variables.product.prodname_copilot %}, depending on your needs and whether you're using {% data variables.product.prodname_copilot_short %} as an individual or as part of an organization or enterprise.
1818

content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ You can cancel your {% data variables.product.prodname_copilot_short %} trial at
4949

5050
## About premium requests
5151

52-
<!-- expires 2025-06-11 -->
52+
<!-- expires 2025-06-18 -->
5353
{% data reusables.copilot.unlimited-premium-requests %}
54-
<!-- end expires 2025-06-11 -->
54+
<!-- end expires 2025-06-18 -->
5555

5656
Your {% data variables.product.prodname_copilot_short %} plan includes premium requests. Premium requests use more advanced models or features and count against your monthly premium request allowance.
5757

content/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ redirect_from:
1010
- /copilot/managing-copilot/monitoring-usage-and-entitlements/avoiding-unexpected-copilot-costs
1111
---
1212

13-
<!-- expires 2025-06-11 -->
13+
<!-- expires 2025-06-18 -->
1414
{% data reusables.copilot.unlimited-premium-requests-with-date %}
15-
<!-- end expires 2025-06-11 -->
15+
<!-- end expires 2025-06-18 -->
1616

1717
## What is a request?
1818

@@ -44,11 +44,12 @@ The following {% data variables.product.prodname_copilot_short %} features can u
4444

4545
Each model has a premium request multiplier, based on its complexity and resource usage. Your premium request allowance is deducted according to this multiplier.
4646

47+
{% data variables.copilot.copilot_gpt_41 %} also serves as the base model. If you use all of your premium requests, you can still use {% data variables.product.prodname_copilot_short %} with the base model for the rest of the month. This is subject to change. Response times for the base model may vary during periods of high usage. Requests to the base model may be subject to rate limiting.
48+
4749
| Model | Premium requests |
4850
|-------------------------------------------------------------------------|------------------------------------------------------------------------------|
49-
| Base model (currently {% data variables.copilot.copilot_gpt_41 %}) [^2] | 0 (paid users), 1 ({% data variables.copilot.copilot_free_short %}) |
50-
| Premium {% data variables.copilot.copilot_gpt_41 %} | 1 |
51-
| {% data variables.copilot.copilot_gpt_4o %} | 1 |
51+
| {% data variables.copilot.copilot_gpt_41 %} | 0 (paid users), 1 ({% data variables.copilot.copilot_free_short %}) |
52+
| {% data variables.copilot.copilot_gpt_4o %} | 0 (paid users), 1 ({% data variables.copilot.copilot_free_short %}) |
5253
| {% data variables.copilot.copilot_gpt_45 %} | 50 |
5354
| {% data variables.copilot.copilot_claude_sonnet_35 %} | 1 |
5455
| {% data variables.copilot.copilot_claude_sonnet_37 %} | 1 |
@@ -62,18 +63,16 @@ Each model has a premium request multiplier, based on its complexity and resourc
6263
| {% data variables.copilot.copilot_o3_mini %} | 0.33 |
6364
| {% data variables.copilot.copilot_o4_mini %} | 0.33 |
6465

65-
[^2]: The base model at the time of writing is powered by {% data variables.copilot.copilot_gpt_41 %}. This is subject to change. Response times for the base model may vary during periods of high usage. Requests to the base model may be subject to rate limiting.
66-
6766
## Additional premium requests
6867

6968
> [!NOTE]
7069
> The option to purchase additional premium requests is not available to:
7170
>
7271
> * Users on {% data variables.copilot.copilot_free_short %}. To access more premium requests, upgrade to a paid plan.
7372
> * Users who subscribe, or have subscribed, to {% data variables.copilot.copilot_pro_short %} or {% data variables.copilot.copilot_pro_plus_short %} through {% data variables.product.prodname_mobile %} on iOS or Android.
74-
> <!-- expires 2025-06-11 -->
73+
> <!-- expires 2025-06-18 -->
7574
> Budget setting for premium requests is coming soon. Until then, you can continue to use {% data variables.product.prodname_copilot_short %} premium models without being billed for additional premium requests.
76-
> <!-- end expires 2025-06-11 -->
75+
> <!-- end expires 2025-06-18 -->
7776
7877
If you use all of your premium requests, you can still use {% data variables.product.prodname_copilot_short %} with the base model for the rest of the month. If you need more premium requests, you can upgrade to a higher plan or set a spending limit for premium requests over your plan's allowance. Premium requests over the allowance are rejected unless you have set a budget. See [AUTOTITLE](/billing/managing-your-billing/preventing-overspending).
7978

content/copilot/managing-copilot/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ redirect_from:
1010
- /copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements
1111
---
1212

13-
<!-- expires 2025-06-11 -->
13+
<!-- expires 2025-06-18 -->
1414
{% data reusables.copilot.unlimited-premium-requests %}
15-
<!-- expires 2025-06-11 -->
15+
<!-- expires 2025-06-18 -->
1616

1717
You can track your monthly usage of premium requests to help you get the most value from your {% data variables.product.prodname_copilot_short %} plan.
1818

content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ We recommend that you identify the people with this role and communicate with th
2424

2525
## Managing charges for premium requests
2626

27-
<!-- expires 2025-06-11 -->
27+
<!-- expires 2025-06-18 -->
2828
{% data reusables.copilot.unlimited-premium-requests %}
29-
<!-- expires 2025-06-11 -->
29+
<!-- expires 2025-06-18 -->
3030

3131
{% data reusables.copilot.premium-requests-for-enterprises %}
3232

content/copilot/rolling-out-github-copilot-at-scale/planning-your-rollout/choosing-your-enterprises-plan-for-github-copilot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ With {% data variables.copilot.copilot_enterprise_short %}, you can make {% data
5757

5858
## How much will we benefit from premium requests?
5959

60-
<!-- expires 2025-06-11 -->
60+
<!-- expires 2025-06-18 -->
6161
{% data reusables.copilot.unlimited-premium-requests %}
62-
<!-- expires 2025-06-11 -->
62+
<!-- expires 2025-06-18 -->
6363

6464
{% data reusables.copilot.premium-requests-for-enterprises %}
6565

content/copilot/using-github-copilot/code-review/using-copilot-code-review.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ The current functionality and availability of the two types of review is summari
4242

4343
The **review changes** type of {% data variables.copilot.copilot_code-review_short %} is a premium feature with a per-person monthly quota.
4444

45-
<!-- expires 2025-06-11 -->
45+
<!-- expires 2025-06-18 -->
4646
> [!NOTE]
4747
> Billing for premium requests is coming soon. Until then, you can continue to use {% data variables.copilot.copilot_code-review_short %} without being billed for additional premium requests. For the most up-to-date start date, see [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests).
48-
<!-- expires 2025-06-11 -->
48+
<!-- expires 2025-06-18 -->
4949
5050
When you assign {% data variables.product.prodname_copilot_short %} as a reviewer for a pull request, one premium request is deducted from your monthly quota each time {% data variables.product.prodname_copilot_short %} posts comments to the pull request. See [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests).
5151

@@ -72,10 +72,10 @@ This version of the article relates to {% data variables.copilot.copilot_code-re
7272

7373
The **review changes** type of {% data variables.copilot.copilot_code-review_short %} is a premium feature with a per-person monthly quota.
7474

75-
<!-- expires 2025-06-11 -->
75+
<!-- expires 2025-06-18 -->
7676
> [!NOTE]
7777
> Billing for premium requests is coming soon. Until then, you can continue to use {% data variables.copilot.copilot_code-review_short %} without being billed for additional premium requests. For the most up-to-date start date, see [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests).
78-
<!-- expires 2025-06-11 -->
78+
<!-- expires 2025-06-18 -->
7979
8080
When you assign {% data variables.product.prodname_copilot_short %} as a reviewer for a pull request, one premium request is deducted from your monthly quota each time {% data variables.product.prodname_copilot_short %} posts comments to the pull request. See [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests).
8181

content/copilot/using-github-copilot/coding-agent/asking-copilot-to-create-a-pull-request.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ For information on making {% data variables.copilot.copilot_coding_agent %} avai
4040
4141
1. Submit your prompt.
4242

43+
{% data variables.product.prodname_copilot_short %} asks you to confirm that you want to use the coding agent to create a pull request.
44+
45+
1. Click **Allow**.
46+
4347
{% data variables.product.prodname_copilot_short %} will respond with a link to the pull request it creates. It will work on the task and push changes to the pull request, and then add you as a reviewer when it has finished, triggering a notification.
4448

4549
## Monitoring progress

content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
title: Creating rulesets for repositories in your organization
33
intro: 'You can create a ruleset to target multiple repositories in your organization.'
44
versions:
5-
feature: repo-rules-enterprise
5+
fpt: '*'
6+
ghec: '*'
7+
ghes: '>= 3.13'
68
permissions: 'Organization owners can create rulesets at the organization level.'
79
topics:
810
- Organizations
@@ -11,7 +13,7 @@ shortTitle: Create rulesets
1113

1214
## Introduction
1315

14-
You can create rulesets in your organization to control how users can interact with repositories in your organization. You can control things like who can push commits to a certain branch and how the commits must be formatted, or who can delete or rename a tag. You can also prevent people from renaming repositories.
16+
For customers on {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plans you can create rulesets in your organization to control how users can interact with repositories in your organization. You can control things like who can push commits to a certain branch and how the commits must be formatted, or who can delete or rename a tag. You can also prevent people from renaming repositories.
1517

1618
{% ifversion push-rulesets %}
1719

@@ -39,10 +41,13 @@ To import one of the prebuilt rulesets by {% data variables.product.prodname_dot
3941
{% data reusables.repositories.rulesets-fnmatch %}
4042
{% ifversion repo-rules-enterprise %}
4143

44+
{% ifversion not fpt %}
45+
4246
## Using regular expressions for commit metadata
4347

4448
{% data reusables.repositories.rulesets-commit-regex %}
4549

50+
{% endif %}
4651
{% endif %}
4752

4853
## Using ruleset enforcement statuses
@@ -57,10 +62,13 @@ To import one of the prebuilt rulesets by {% data variables.product.prodname_dot
5762
{% data reusables.repositories.create-ruleset-step %}
5863
{% data reusables.repositories.rulesets-general-step %}
5964

65+
{% ifversion not fpt %}
66+
6067
### Granting bypass permissions for your branch or tag ruleset
6168

6269
{% data reusables.repositories.rulesets-bypass-step %}
6370
{% data reusables.repositories.rulesets-branch-tag-bypass-optional-step %}
71+
{% endif %}
6472

6573
### Choosing which repositories to target in your organization
6674

@@ -74,9 +82,12 @@ To import one of the prebuilt rulesets by {% data variables.product.prodname_dot
7482

7583
{% data reusables.repositories.rulesets-protections-step %}
7684

85+
{% ifversion not fpt %}
86+
7787
### Adding metadata restrictions
7888

7989
{% data reusables.repositories.rulesets-metadata-step %}
90+
{% endif %}
8091

8192
### Finalizing your branch or tag ruleset and next steps
8293

content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ shortTitle: Custom properties
1616
Custom properties allow you to decorate your repositories with information such as compliance frameworks, data sensitivity, or project details. Custom properties visibility follows the visibility of the repository. Custom properties on public repositories can be viewed by anyone, while custom properties on internal or private repositories can be viewed by accounts with read permissions to the repository.
1717
An organization can have up to 100 property definitions. An allowed value list can have up to 200 items.
1818

19-
{% ifversion ghec or ghes %}
2019
You can use repository properties to determine which repositories to target with a ruleset. For more information, see [AUTOTITLE](/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization#targeting-repositories-by-properties-in-your-organization).
21-
{% endif %}
2220

2321
{% ifversion ghec %}
2422
You can define custom properties at the enterprise level to create a consistent experience across organizations. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/managing-custom-properties-for-repositories-in-your-enterprise).

content/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
title: Managing rulesets for repositories in your organization
33
intro: 'You can edit, monitor, and delete existing rulesets to alter how people can interact with repositories in your organization.'
44
versions:
5-
feature: repo-rules-enterprise
5+
fpt: '*'
6+
ghec: '*'
7+
ghes: '>= 3.13'
68
permissions: 'Organization owners and users with the "Manage organization ref update rules and rulesets" permission can manage rulesets at the organization level.'
79
topics:
810
- Organizations
@@ -11,7 +13,7 @@ shortTitle: Manage rulesets
1113

1214
## About managing rulesets for an organization
1315

14-
After creating a ruleset at the organization level, you can make changes to the ruleset to alter how people can interact with the targeted repositories. For example, you can add rules to better protect the branches or tags in those repositories, or you can switch your ruleset from "Evaluate" mode to "Active" after testing its effects on the contributor experience for your repositories. Organizational rulesets that apply to branches of a repository will no longer allow the repository administrator to rename branches of the targeted repository or change the default branch to another branch. Repository administrators may create and delete branches so long as they have the appropriate permissions.
16+
After creating a ruleset at the organization level, you can make changes to the ruleset to alter how people can interact with the targeted repositories. For example, you can add rules to better protect the branches or tags in those repositories{% ifversion not fpt %}, or you can switch your ruleset from "Evaluate" mode to "Active" after testing its effects on the contributor experience for your repositories{% endif %}. Organizational rulesets that apply to branches of a repository will no longer allow the repository administrator to rename branches of the targeted repository or change the default branch to another branch. Repository administrators may create and delete branches so long as they have the appropriate permissions.
1517

1618
{% ifversion push-rule-delegated-bypass %}
1719

@@ -64,6 +66,7 @@ You can import a ruleset from another repository or organization using the expor
6466
{% data reusables.repositories.import-a-ruleset %}
6567

6668
{% endif %}
69+
{% ifversion not fpt %}
6770

6871
## Viewing insights for rulesets
6972

@@ -83,3 +86,4 @@ You can view insights for rulesets to see how rulesets are affecting the reposit
8386
{% data reusables.repositories.managing-delegated-bypass %}
8487

8588
{% endif %}
89+
{% endif %}

content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ shortTitle: About rulesets
1414

1515
## About rulesets
1616

17-
A ruleset is a named list of rules that applies to a repository{% ifversion repo-rules-enterprise %}, or to multiple repositories in an organization{% endif %}. You can have up to 75 rulesets per repository{% ifversion repo-rules-enterprise %}, and 75 organization-wide rulesets{% endif %}.
17+
A ruleset is a named list of rules that applies to a repository or to multiple repositories in an organization for customers on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans. You can have up to 75 rulesets per repository, and 75 organization-wide rulesets.
1818

1919
When you create a ruleset, you can allow certain users to bypass the rules in the ruleset. This can be users with a certain role, such as repository administrator, or it can be specific teams or {% data variables.product.prodname_github_apps %}. For more information about granting bypass permissions, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository#granting-bypass-permissions-for-your-ruleset).
2020

content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ When you create a ruleset, you can allow certain users to bypass the rules in th
2626

2727
For more information on rulesets, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets).
2828

29-
{% ifversion repo-rules-enterprise %}
30-
You can also create rulesets for all repositories in an organization. For more information, see [AUTOTITLE](/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization).{% endif %}
29+
For customers on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans you can also create rulesets for repositories in an organization. For more information, see [AUTOTITLE](/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization).
3130

3231
{% ifversion repo-rules-management %}
3332

content/rest/copilot/copilot-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: REST API endpoints for Copilot metrics
33
shortTitle: Copilot metrics
4-
intro: Use the REST API to view Copilot metrics.
4+
intro: Use the REST API to view {% data variables.product.prodname_copilot_short %} metrics.
55
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
66
fpt: '*'
77
ghec: '*'

content/rest/copilot/copilot-user-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: REST API endpoints for Copilot user management
33
shortTitle: Copilot user management
4-
intro: 'Use the REST API to manage the {% data variables.copilot.copilot_for_business %} or {% data variables.copilot.copilot_enterprise %} subscription for your organization.'
4+
intro: 'Use the REST API to manage the {% data variables.copilot.copilot_for_business %}{% ifversion ghec %} or {% data variables.copilot.copilot_enterprise %}{% endif %} subscription for your organization.'
55
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
66
fpt: '*'
77
ghec: '*'

content/rest/copilot/index.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
title: REST API endpoints for Copilot
33
shortTitle: Copilot
44
intro: >-
5-
Use the REST API to manage the {% data
6-
variables.copilot.copilot_for_business %} subscription for your
7-
organization.
5+
Use the REST API to monitor and manage {% data variables.product.prodname_copilot %}.
86
topics:
97
- API
108
autogenerated: rest

data/reusables/copilot/unlimited-premium-requests-with-date.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
> [!IMPORTANT]
2-
> Billing for premium requests is coming soon. Until then, you can continue to use {% data variables.product.prodname_copilot_short %} premium models without being billed for additional premium requests. We’ll update this article with the latest start date at least two business days in advance.
2+
> Billing for premium requests will start on **June 18, 2025** for all plans. Until then, you can continue to use {% data variables.product.prodname_copilot_short %} premium models without being billed for additional premium requests.
33
>
44
> When billing begins, your premium request counter will be reset to zero and you will be able to track your usage. See [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements).
55
>

0 commit comments

Comments
 (0)