diff --git a/.github/workflows/first-responder-v2-prs-collect.yml b/.github/workflows/first-responder-v2-prs-collect.yml index 47589a9ea5ff..84e8367d6a3f 100644 --- a/.github/workflows/first-responder-v2-prs-collect.yml +++ b/.github/workflows/first-responder-v2-prs-collect.yml @@ -23,6 +23,9 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Check if the event originated from a team member uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 id: check-membership diff --git a/content/copilot/about-github-copilot/plans-for-github-copilot.md b/content/copilot/about-github-copilot/plans-for-github-copilot.md index b79cdd7b5a6c..694cd7ca3e16 100644 --- a/content/copilot/about-github-copilot/plans-for-github-copilot.md +++ b/content/copilot/about-github-copilot/plans-for-github-copilot.md @@ -10,9 +10,9 @@ redirect_from: - /copilot/about-github-copilot/subscription-plans-for-github-copilot --- - + {% data reusables.copilot.unlimited-premium-requests %} - + {% 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. diff --git a/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md b/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md index bcff81645ce5..59acbc62f05d 100644 --- a/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md +++ b/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md @@ -49,9 +49,9 @@ You can cancel your {% data variables.product.prodname_copilot_short %} trial at ## About premium requests - + {% data reusables.copilot.unlimited-premium-requests %} - + 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. diff --git a/content/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests.md b/content/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests.md index 8d2c2e153dfe..0ecc1685d893 100644 --- a/content/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests.md +++ b/content/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests.md @@ -10,9 +10,9 @@ redirect_from: - /copilot/managing-copilot/monitoring-usage-and-entitlements/avoiding-unexpected-copilot-costs --- - + {% data reusables.copilot.unlimited-premium-requests-with-date %} - + ## What is a request? @@ -44,11 +44,12 @@ The following {% data variables.product.prodname_copilot_short %} features can u Each model has a premium request multiplier, based on its complexity and resource usage. Your premium request allowance is deducted according to this multiplier. +{% 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. + | Model | Premium requests | |-------------------------------------------------------------------------|------------------------------------------------------------------------------| -| Base model (currently {% data variables.copilot.copilot_gpt_41 %}) [^2] | 0 (paid users), 1 ({% data variables.copilot.copilot_free_short %}) | -| Premium {% data variables.copilot.copilot_gpt_41 %} | 1 | -| {% data variables.copilot.copilot_gpt_4o %} | 1 | +| {% data variables.copilot.copilot_gpt_41 %} | 0 (paid users), 1 ({% data variables.copilot.copilot_free_short %}) | +| {% data variables.copilot.copilot_gpt_4o %} | 0 (paid users), 1 ({% data variables.copilot.copilot_free_short %}) | | {% data variables.copilot.copilot_gpt_45 %} | 50 | | {% data variables.copilot.copilot_claude_sonnet_35 %} | 1 | | {% data variables.copilot.copilot_claude_sonnet_37 %} | 1 | @@ -62,8 +63,6 @@ Each model has a premium request multiplier, based on its complexity and resourc | {% data variables.copilot.copilot_o3_mini %} | 0.33 | | {% data variables.copilot.copilot_o4_mini %} | 0.33 | -[^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. - ## Additional premium requests > [!NOTE] @@ -71,9 +70,9 @@ Each model has a premium request multiplier, based on its complexity and resourc > > * Users on {% data variables.copilot.copilot_free_short %}. To access more premium requests, upgrade to a paid plan. > * 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. -> +> > 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. -> +> 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). diff --git a/content/copilot/managing-copilot/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements.md b/content/copilot/managing-copilot/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements.md index 56b70ba840ce..e71465a85e31 100644 --- a/content/copilot/managing-copilot/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements.md +++ b/content/copilot/managing-copilot/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements.md @@ -10,9 +10,9 @@ redirect_from: - /copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements --- - + {% data reusables.copilot.unlimited-premium-requests %} - + 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. diff --git a/content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md b/content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md index 799f7fd98a84..ad88111bad7d 100644 --- a/content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md +++ b/content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md @@ -24,9 +24,9 @@ We recommend that you identify the people with this role and communicate with th ## Managing charges for premium requests - + {% data reusables.copilot.unlimited-premium-requests %} - + {% data reusables.copilot.premium-requests-for-enterprises %} diff --git a/content/copilot/rolling-out-github-copilot-at-scale/planning-your-rollout/choosing-your-enterprises-plan-for-github-copilot.md b/content/copilot/rolling-out-github-copilot-at-scale/planning-your-rollout/choosing-your-enterprises-plan-for-github-copilot.md index 7d94c884a2ac..274f44ebc3e4 100644 --- a/content/copilot/rolling-out-github-copilot-at-scale/planning-your-rollout/choosing-your-enterprises-plan-for-github-copilot.md +++ b/content/copilot/rolling-out-github-copilot-at-scale/planning-your-rollout/choosing-your-enterprises-plan-for-github-copilot.md @@ -57,9 +57,9 @@ With {% data variables.copilot.copilot_enterprise_short %}, you can make {% data ## How much will we benefit from premium requests? - + {% data reusables.copilot.unlimited-premium-requests %} - + {% data reusables.copilot.premium-requests-for-enterprises %} diff --git a/content/copilot/using-github-copilot/code-review/using-copilot-code-review.md b/content/copilot/using-github-copilot/code-review/using-copilot-code-review.md index 20c904e90e90..62353f8234fc 100644 --- a/content/copilot/using-github-copilot/code-review/using-copilot-code-review.md +++ b/content/copilot/using-github-copilot/code-review/using-copilot-code-review.md @@ -42,10 +42,10 @@ The current functionality and availability of the two types of review is summari The **review changes** type of {% data variables.copilot.copilot_code-review_short %} is a premium feature with a per-person monthly quota. - + > [!NOTE] > 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). - + 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). @@ -72,10 +72,10 @@ This version of the article relates to {% data variables.copilot.copilot_code-re The **review changes** type of {% data variables.copilot.copilot_code-review_short %} is a premium feature with a per-person monthly quota. - + > [!NOTE] > 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). - + 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). diff --git a/content/copilot/using-github-copilot/coding-agent/asking-copilot-to-create-a-pull-request.md b/content/copilot/using-github-copilot/coding-agent/asking-copilot-to-create-a-pull-request.md index 2b76374875ad..e406cd5d4872 100644 --- a/content/copilot/using-github-copilot/coding-agent/asking-copilot-to-create-a-pull-request.md +++ b/content/copilot/using-github-copilot/coding-agent/asking-copilot-to-create-a-pull-request.md @@ -40,6 +40,10 @@ For information on making {% data variables.copilot.copilot_coding_agent %} avai 1. Submit your prompt. + {% data variables.product.prodname_copilot_short %} asks you to confirm that you want to use the coding agent to create a pull request. + +1. Click **Allow**. + {% 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. ## Monitoring progress diff --git a/content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md index 493b0c1e076e..e87685802673 100644 --- a/content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md @@ -2,7 +2,9 @@ title: Creating rulesets for repositories in your organization intro: 'You can create a ruleset to target multiple repositories in your organization.' versions: - feature: repo-rules-enterprise + fpt: '*' + ghec: '*' + ghes: '>= 3.13' permissions: 'Organization owners can create rulesets at the organization level.' topics: - Organizations @@ -11,7 +13,7 @@ shortTitle: Create rulesets ## Introduction -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. +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. {% ifversion push-rulesets %} @@ -39,10 +41,13 @@ To import one of the prebuilt rulesets by {% data variables.product.prodname_dot {% data reusables.repositories.rulesets-fnmatch %} {% ifversion repo-rules-enterprise %} +{% ifversion not fpt %} + ## Using regular expressions for commit metadata {% data reusables.repositories.rulesets-commit-regex %} +{% endif %} {% endif %} ## Using ruleset enforcement statuses @@ -57,10 +62,13 @@ To import one of the prebuilt rulesets by {% data variables.product.prodname_dot {% data reusables.repositories.create-ruleset-step %} {% data reusables.repositories.rulesets-general-step %} +{% ifversion not fpt %} + ### Granting bypass permissions for your branch or tag ruleset {% data reusables.repositories.rulesets-bypass-step %} {% data reusables.repositories.rulesets-branch-tag-bypass-optional-step %} +{% endif %} ### Choosing which repositories to target in your organization @@ -74,9 +82,12 @@ To import one of the prebuilt rulesets by {% data variables.product.prodname_dot {% data reusables.repositories.rulesets-protections-step %} +{% ifversion not fpt %} + ### Adding metadata restrictions {% data reusables.repositories.rulesets-metadata-step %} +{% endif %} ### Finalizing your branch or tag ruleset and next steps diff --git a/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md index f4c986005641..56ff6c0a9ab5 100644 --- a/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md @@ -16,9 +16,7 @@ shortTitle: Custom properties 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. An organization can have up to 100 property definitions. An allowed value list can have up to 200 items. -{% ifversion ghec or ghes %} 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). -{% endif %} {% ifversion ghec %} 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). diff --git a/content/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization.md index 5e1e6e5224b1..639729327304 100644 --- a/content/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization.md @@ -2,7 +2,9 @@ title: Managing rulesets for repositories in your organization intro: 'You can edit, monitor, and delete existing rulesets to alter how people can interact with repositories in your organization.' versions: - feature: repo-rules-enterprise + fpt: '*' + ghec: '*' + ghes: '>= 3.13' permissions: 'Organization owners and users with the "Manage organization ref update rules and rulesets" permission can manage rulesets at the organization level.' topics: - Organizations @@ -11,7 +13,7 @@ shortTitle: Manage rulesets ## About managing rulesets for an organization -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. +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. {% ifversion push-rule-delegated-bypass %} @@ -64,6 +66,7 @@ You can import a ruleset from another repository or organization using the expor {% data reusables.repositories.import-a-ruleset %} {% endif %} +{% ifversion not fpt %} ## Viewing insights for rulesets @@ -83,3 +86,4 @@ You can view insights for rulesets to see how rulesets are affecting the reposit {% data reusables.repositories.managing-delegated-bypass %} {% endif %} +{% endif %} diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets.md index 4da3fec039f4..a697d6ee97e4 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets.md @@ -14,7 +14,7 @@ shortTitle: About rulesets ## About rulesets -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 %}. +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. 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). diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository.md index a7b4566e4d9b..963ebbc2b340 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository.md @@ -26,8 +26,7 @@ When you create a ruleset, you can allow certain users to bypass the rules in th For more information on rulesets, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets). -{% ifversion repo-rules-enterprise %} -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 %} +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). {% ifversion repo-rules-management %} diff --git a/content/rest/copilot/copilot-metrics.md b/content/rest/copilot/copilot-metrics.md index db797fa86298..2b16cb5744ec 100644 --- a/content/rest/copilot/copilot-metrics.md +++ b/content/rest/copilot/copilot-metrics.md @@ -1,7 +1,7 @@ --- title: REST API endpoints for Copilot metrics shortTitle: Copilot metrics -intro: Use the REST API to view Copilot metrics. +intro: Use the REST API to view {% data variables.product.prodname_copilot_short %} metrics. versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖 fpt: '*' ghec: '*' diff --git a/content/rest/copilot/copilot-user-management.md b/content/rest/copilot/copilot-user-management.md index 7fd1ddcdbd8c..776f3fa347c9 100644 --- a/content/rest/copilot/copilot-user-management.md +++ b/content/rest/copilot/copilot-user-management.md @@ -1,7 +1,7 @@ --- title: REST API endpoints for Copilot user management shortTitle: Copilot user management -intro: 'Use the REST API to manage the {% data variables.copilot.copilot_for_business %} or {% data variables.copilot.copilot_enterprise %} subscription for your organization.' +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.' versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖 fpt: '*' ghec: '*' diff --git a/content/rest/copilot/index.md b/content/rest/copilot/index.md index 0ed3ee053dc7..1671a163fb21 100644 --- a/content/rest/copilot/index.md +++ b/content/rest/copilot/index.md @@ -2,9 +2,7 @@ title: REST API endpoints for Copilot shortTitle: Copilot intro: >- - Use the REST API to manage the {% data - variables.copilot.copilot_for_business %} subscription for your - organization. + Use the REST API to monitor and manage {% data variables.product.prodname_copilot %}. topics: - API autogenerated: rest diff --git a/data/reusables/copilot/unlimited-premium-requests-with-date.md b/data/reusables/copilot/unlimited-premium-requests-with-date.md index 7a3459d6bf77..d22446ea6cb4 100644 --- a/data/reusables/copilot/unlimited-premium-requests-with-date.md +++ b/data/reusables/copilot/unlimited-premium-requests-with-date.md @@ -1,5 +1,5 @@ > [!IMPORTANT] -> 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. +> 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. > > 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). >