diff --git a/content/copilot/concepts/agents/code-review.md b/content/copilot/concepts/agents/code-review.md index b99f5521e45b..79f705f0beef 100644 --- a/content/copilot/concepts/agents/code-review.md +++ b/content/copilot/concepts/agents/code-review.md @@ -12,7 +12,7 @@ redirect_from: - /copilot/concepts/code-review/code-review - /copilot/concepts/code-review contentType: concepts -category: +category: - Learn about Copilot --- @@ -69,7 +69,7 @@ If you receive {% data variables.product.prodname_copilot_short %} from an organ ## Code review monthly quota -Each time {% data variables.product.prodname_copilot_short %} reviews a pull request, or reviews files in your IDE that contain changes, your monthly quota of Copilot premium requests is reduced by one. Code review for currently selected text in {% data variables.product.prodname_vscode_shortname %} does not consume a premium request. For information about premium requests, see [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests). +Each time {% data variables.product.prodname_copilot_short %} reviews a pull request, or reviews files in your IDE that contain uncommitted changes, your monthly quota of Copilot premium requests is reduced by one. Code review for currently selected text in {% data variables.product.prodname_vscode_shortname %} does not consume a premium request. For information about premium requests, see [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests). If a repository is configured to automatically request a code review from {% data variables.product.prodname_copilot_short %} for all new pull requests, the premium request usage is applied to the quota of the pull request author. If a pull request is created by {% data variables.product.prodname_actions %} or by a bot, the usage will apply to the user who triggered the workflow (if identifiable), or to a designated billing owner. diff --git a/content/copilot/concepts/billing/copilot-requests.md b/content/copilot/concepts/billing/copilot-requests.md index 263523bb2574..d758f15b6643 100644 --- a/content/copilot/concepts/billing/copilot-requests.md +++ b/content/copilot/concepts/billing/copilot-requests.md @@ -39,8 +39,7 @@ The following {% data variables.product.prodname_copilot_short %} features can u | Feature | Premium request consumption | SKU Attribution | | ------- | ----------- | ----------- | -| [Agent mode in {% data variables.copilot.copilot_chat_short %}](/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-your-ide#copilot-edits) | Agent mode uses **one premium request** per user prompt, multiplied by the model's rate. | {% data variables.product.prodname_copilot_short %} premium requests | -| [{% data variables.copilot.copilot_chat_short %}](/copilot/using-github-copilot/copilot-chat) | {% data variables.copilot.copilot_chat_short %} uses **one premium request** per user prompt, multiplied by the model's rate. | {% data variables.product.prodname_copilot_short %} premium requests | +| [{% data variables.copilot.copilot_chat_short %}](/copilot/using-github-copilot/copilot-chat) | {% data variables.copilot.copilot_chat_short %} uses **one premium request** per user prompt, multiplied by the model's rate. This includes edit, agent, and plan modes in {% data variables.copilot.copilot_chat_short %} in an IDE. | {% data variables.product.prodname_copilot_short %} premium requests | | [{% data variables.copilot.copilot_cli_short %}](/copilot/concepts/agents/about-copilot-cli) | Each prompt to {% data variables.copilot.copilot_cli_short %} uses **one premium request** with the default model. For other models, this is multiplied by the model's rate. | {% data variables.product.prodname_copilot_short %} premium requests | | [{% data variables.product.prodname_copilot_short %} code review](/copilot/using-github-copilot/code-review/using-copilot-code-review) | When you assign {% data variables.product.prodname_copilot_short %} as a reviewer for a pull request, **one premium request** is used each time {% data variables.product.prodname_copilot_short %} posts comments to the pull request. | {% data variables.product.prodname_copilot_short %} premium requests | | [{% data variables.copilot.copilot_coding_agent %}](/copilot/concepts/about-copilot-coding-agent) | {% data variables.copilot.copilot_coding_agent %} uses **one premium request** per session, plus **one premium request** for each real-time steering comment made during an active session. A session begins when you ask {% data variables.product.prodname_copilot_short %} to create a pull request or make one or more changes to an existing pull request. | {% data variables.copilot.copilot_coding_agent %} premium requests | diff --git a/content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md b/content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md index 79aaecf4cc9b..6e09733b4e41 100644 --- a/content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md +++ b/content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md @@ -13,7 +13,7 @@ redirect_from: - /copilot/how-tos/custom-instructions/adding-repository-custom-instructions-for-github-copilot - /copilot/how-tos/custom-instructions/add-repository-instructions - /copilot/how-tos/use-copilot-agents/request-a-code-review/configure-coding-guidelines -category: +category: - Configure Copilot --- @@ -266,9 +266,6 @@ Once saved, these instructions will apply to the current project in Eclipse that ## Creating repository-wide custom instructions -> [!NOTE] -> {% data reusables.copilot.custom-instructions-ccr-support %} See [AUTOTITLE](/copilot/how-tos/use-copilot-agents/request-a-code-review/use-code-review?tool=vscode). - 1. In the root of your repository, create a file named `.github/copilot-instructions.md`. Create the `.github` directory if it does not already exist. diff --git a/content/copilot/how-tos/use-copilot-agents/coding-agent/integrate-coding-agent-with-slack.md b/content/copilot/how-tos/use-copilot-agents/coding-agent/integrate-coding-agent-with-slack.md index 4e73e765a7b7..0773fc40fa19 100644 --- a/content/copilot/how-tos/use-copilot-agents/coding-agent/integrate-coding-agent-with-slack.md +++ b/content/copilot/how-tos/use-copilot-agents/coding-agent/integrate-coding-agent-with-slack.md @@ -42,7 +42,7 @@ You can send the {% data variables.product.prodname_github_app %} direct message You must have write access to the default repository – or the repository specified in your prompt – in order to trigger {% data variables.copilot.copilot_coding_agent %} to work. If you do not have write access to the relevant repository, you can still help guide {% data variables.product.prodname_copilot_short %} by providing input in the Slack thread, which will be used as context when {% data variables.copilot.copilot_coding_agent %} makes changes in the pull request. -Users can invoke {% data variables.copilot.copilot_coding_agent %} on any repository where they have `write` access. For enterprise-owned repositories, administrators must install and configure the [Slack {% data variables.product.prodname_github_app %}](https://github.com/organizations/github/settings/apps/slack?ref_product=copilot&ref_type=engagement&ref_style=text&ref_plan=enterprise&utm_source=docs-web-settings-apps-slack-copilot&utm_medium=docs&utm_campaign=universe25post) and specify which repositories the Slack app can access. For more information about configuring {% data variables.product.prodname_github_apps %}, see [AUTOTITLE](/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations). +Users can invoke {% data variables.copilot.copilot_coding_agent %} on any repository where they have `write` access. For enterprise-owned repositories, administrators must install and configure the [Slack {% data variables.product.prodname_github_app %}](https://github.com/marketplace/slack-github?ref_product=copilot&ref_type=engagement&ref_style=text&ref_plan=enterprise&utm_source=docs-web-settings-apps-slack-copilot&utm_medium=docs&utm_campaign=universe25post) and specify which repositories the Slack app can access. For more information about configuring {% data variables.product.prodname_github_apps %}, see [AUTOTITLE](/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations). 1. In Slack, open a direct message with the {% data variables.product.prodname_github_app %} or mention the app in a thread by typing `@{% data variables.product.prodname_copilot %}`. 1. Type your prompt, then send it. Optionally, you can specify a repository or branch using the following syntax: diff --git a/content/copilot/how-tos/use-copilot-agents/request-a-code-review/use-code-review.md b/content/copilot/how-tos/use-copilot-agents/request-a-code-review/use-code-review.md index cf61510b08fc..0d2df4d7931d 100644 --- a/content/copilot/how-tos/use-copilot-agents/request-a-code-review/use-code-review.md +++ b/content/copilot/how-tos/use-copilot-agents/request-a-code-review/use-code-review.md @@ -16,7 +16,7 @@ redirect_from: - /copilot/how-tos/agents/copilot-code-review/use-code-review - /copilot/how-tos/agents/request-a-code-review/use-code-review contentType: how-tos -category: +category: - Author and optimize with Copilot --- @@ -97,17 +97,8 @@ By default, you manually request a review from {% data variables.product.prodnam You can request an initial review of a highlighted selection of code in {% data variables.product.prodname_vscode %}. 1. In {% data variables.product.prodname_vscode %}, select the code you want to review. -1. Open the {% data variables.product.prodname_vscode_command_palette_shortname %} - * For Mac: - * Use: Shift+Command+P - * For Windows or Linux: - * Use Ctrl+Shift+P -1. In the command palette, search for and select **{% data variables.product.prodname_copilot %}: Review and Comment**. - - ![Screenshot of the command palette in {% data variables.product.prodname_vscode %} with the **{% data variables.product.prodname_copilot %}: Review and Comment** command selected.](/assets/images/help/copilot/vsc-review-and-comment.png) - -1. Wait for {% data variables.product.prodname_copilot_short %} to review your changes. This usually takes less than 30 seconds. -1. If {% data variables.product.prodname_copilot_short %} has any comments, they will be shown inline in your file, and in the **Problems** tab. +1. Right-click the selected code and choose **Generate Code** > **Review**. +1. {% data variables.product.prodname_vscode_shortname %} creates review comments in the **Comments** panel and also shows them inline in the editor. ### Reviewing all uncommitted changes @@ -141,9 +132,6 @@ To provide feedback, hover over the comment and click the thumbs up or thumbs do ## Customizing {% data variables.product.prodname_copilot_short %}'s reviews with custom instructions -> [!NOTE] -> {% data reusables.copilot.custom-instructions-ccr-support %} - {% data reusables.copilot.code-review.custom-instructions-information %} {% endvscode %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/about-migrations-from-azure-devops-to-github-enterprise-cloud.md b/content/migrations/ado/about-migrations-from-azure-devops-to-github-enterprise-cloud.md similarity index 89% rename from content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/about-migrations-from-azure-devops-to-github-enterprise-cloud.md rename to content/migrations/ado/about-migrations-from-azure-devops-to-github-enterprise-cloud.md index df802610ad86..41ebbb83a8eb 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/about-migrations-from-azure-devops-to-github-enterprise-cloud.md +++ b/content/migrations/ado/about-migrations-from-azure-devops-to-github-enterprise-cloud.md @@ -1,11 +1,14 @@ --- title: About migrations from Azure DevOps to GitHub Enterprise Cloud shortTitle: About migrations -intro: 'Learn which data {% data variables.product.prodname_importer_proper_name %} can migrate.' +intro: Learn which data {% data variables.product.prodname_importer_proper_name %} can migrate. versions: fpt: '*' ghes: '*' ghec: '*' +redirect_from: + - /migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/about-migrations-from-azure-devops-to-github-enterprise-cloud +contentType: other --- ## About migrations from Azure DevOps diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/index.md b/content/migrations/ado/index.md similarity index 60% rename from content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/index.md rename to content/migrations/ado/index.md index 5ed38f1d88b9..ce6e27dd4907 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/index.md +++ b/content/migrations/ado/index.md @@ -1,7 +1,7 @@ --- title: Migrating from Azure DevOps to GitHub Enterprise Cloud shortTitle: Migrate from Azure DevOps -intro: 'You can migrate repositories to {% data variables.product.prodname_dotcom %} with {% data variables.product.prodname_importer_proper_name %}.' +intro: You can migrate repositories to {% data variables.product.prodname_dotcom %} with {% data variables.product.prodname_importer_proper_name %}. versions: fpt: '*' ghes: '*' @@ -11,5 +11,8 @@ children: - /overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud - /managing-access-for-a-migration-from-azure-devops - /migrating-repositories-from-azure-devops-to-github-enterprise-cloud +redirect_from: + - /migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud +contentType: other --- diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md b/content/migrations/ado/managing-access-for-a-migration-from-azure-devops.md similarity index 94% rename from content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md rename to content/migrations/ado/managing-access-for-a-migration-from-azure-devops.md index 183d2bf2975d..ef9a2abd122a 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md +++ b/content/migrations/ado/managing-access-for-a-migration-from-azure-devops.md @@ -1,11 +1,14 @@ --- title: Managing access for a migration from Azure DevOps shortTitle: Manage access -intro: 'Before you use {% data variables.product.prodname_importer_proper_name %}, make sure you have appropriate access to both the source and destination of your migration.' +intro: Before you use {% data variables.product.prodname_importer_proper_name %}, make sure you have appropriate access to both the source and destination of your migration. versions: fpt: '*' ghes: '*' ghec: '*' +redirect_from: + - /migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops +contentType: other --- ## About required access for {% data variables.product.prodname_importer_proper_name %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md b/content/migrations/ado/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md similarity index 96% rename from content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md rename to content/migrations/ado/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md index 43f2d485da7a..02003b38b1da 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md +++ b/content/migrations/ado/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md @@ -1,7 +1,7 @@ --- title: Migrating repositories from Azure DevOps to GitHub Enterprise Cloud shortTitle: Migrate repositories -intro: 'You can migrate repositories from Azure DevOps to {% data variables.product.prodname_ghe_cloud %}, using the {% data variables.product.prodname_cli %} or the GraphQL API.' +intro: You can migrate repositories from Azure DevOps to {% data variables.product.prodname_ghe_cloud %}, using the {% data variables.product.prodname_cli %} or the GraphQL API. versions: fpt: '*' ghes: '*' @@ -11,6 +11,8 @@ redirect_from: - /early-access/enterprise-importer/migrating-repositories-with-github-enterprise-importer/migrating-repositories-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud - /early-access/enterprise-importer/migrating-repositories-with-github-enterprise-importer/migrating-repositories-from-azure-devops-to-github-enterprise-cloud - /migrations/using-github-enterprise-importer/migrating-repositories-with-github-enterprise-importer/migrating-repositories-from-azure-devops-to-github-enterprise-cloud + - /migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud +contentType: other --- ## About repository migrations with {% data variables.product.prodname_importer_proper_name %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md b/content/migrations/ado/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md similarity index 96% rename from content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md rename to content/migrations/ado/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md index 7d8128a2cc70..0ae77a2f6002 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md +++ b/content/migrations/ado/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md @@ -1,7 +1,7 @@ --- title: Overview of a migration from Azure DevOps to GitHub Enterprise Cloud shortTitle: Overview of a migration -intro: 'Learn how to complete the entire process of migrating from Azure DevOps to {% data variables.product.prodname_dotcom %} with {% data variables.product.prodname_importer_proper_name %}, from planning to implementation to completing follow-up tasks.' +intro: Learn how to complete the entire process of migrating from Azure DevOps to {% data variables.product.prodname_dotcom %} with {% data variables.product.prodname_importer_proper_name %}, from planning to implementation to completing follow-up tasks. versions: fpt: '*' ghes: '*' @@ -10,6 +10,8 @@ redirect_from: - /early-access/github/migrating-with-github-enterprise-importer/understanding-github-enterprise-importer/migrating-from-azure-devops-with-github-enterprise-importer - /early-access/enterprise-importer/understanding-github-enterprise-importer/migrating-from-azure-devops-with-github-enterprise-importer - /migrations/using-github-enterprise-importer/understanding-github-enterprise-importer/migrating-from-azure-devops-with-github-enterprise-importer + - /migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud +contentType: other --- ## Overview diff --git a/content/migrations/index.md b/content/migrations/index.md index 550be1159d1c..c44dca186e06 100644 --- a/content/migrations/index.md +++ b/content/migrations/index.md @@ -1,7 +1,7 @@ --- title: Migrations documentation shortTitle: Migrations -intro: 'If you''re moving to {% data variables.product.prodname_dotcom %} from another code hosting platform or moving between {% data variables.product.prodname_dotcom %} products, learn how to use our migration tooling to bring your work with you.' +intro: If you're moving to {% data variables.product.prodname_dotcom %} from another code hosting platform or moving between {% data variables.product.prodname_dotcom %} products, learn how to use our migration tooling to bring your work with you. introLinks: overview: /migrations/overview/about-githubs-migration-tooling plan_your_migration: /migrations/overview/planning-your-migration-to-github @@ -30,7 +30,9 @@ topics: - Repositories children: - /overview + - /ado - /importing-source-code - /using-github-enterprise-importer - /using-ghe-migrator --- + diff --git a/content/migrations/using-github-enterprise-importer/index.md b/content/migrations/using-github-enterprise-importer/index.md index 81f1b7f4cfd6..3806039e80dd 100644 --- a/content/migrations/using-github-enterprise-importer/index.md +++ b/content/migrations/using-github-enterprise-importer/index.md @@ -1,14 +1,13 @@ --- title: Using GitHub Enterprise Importer shortTitle: GitHub Enterprise Importer -intro: 'You can migrate your enterprise to {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_importer_proper_name %}.' +intro: You can migrate your enterprise to {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_importer_proper_name %}. versions: fpt: '*' ghes: '*' ghec: '*' children: - /understanding-github-enterprise-importer - - /migrating-from-azure-devops-to-github-enterprise-cloud - /migrating-from-bitbucket-server-to-github-enterprise-cloud - /migrating-between-github-products - /completing-your-migration-with-github-enterprise-importer @@ -21,3 +20,4 @@ redirect_from: - /early-access/enterprise-importer/migrating-repositories-with-github-enterprise-importer/migrating-repositories-to-github-ae - /early-access/enterprise-importer --- + diff --git a/data/reusables/copilot/custom-instructions-ccr-support.md b/data/reusables/copilot/custom-instructions-ccr-support.md deleted file mode 100644 index b7d2be6bb44e..000000000000 --- a/data/reusables/copilot/custom-instructions-ccr-support.md +++ /dev/null @@ -1 +0,0 @@ -Currently, {% data variables.copilot.copilot_code-review_short %} in {% data variables.product.prodname_vscode_shortname %} only supports repository-wide custom instructions, and these are only supported when you are reviewing a selection of code in a file, not when reviewing all uncommitted changes.