Merge branch 'main' into choose-ai-model

Author: Sharra-writes

.github/workflows/triage-stale-check.yml

@@ -48,6 +48,7 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-pr-message: 'This is a gentle bump for the docs team that this PR is waiting for review.'
+          days-before-issue-stale: -1
           days-before-pr-stale: 14
           days-before-pr-close: -1 # Never close
           remove-stale-when-updated: false

content/copilot/customizing-copilot/customizing-the-development-environment-for-copilot-coding-agent.md

@@ -20,11 +20,12 @@ redirect_from:
 
 While working on a task, {% data variables.product.prodname_copilot_short %} has access to its own ephemeral development environment, powered by {% data variables.product.prodname_actions %}, where it can explore your code, make changes, execute automated tests and linters and more.
 
-You can customize {% data variables.product.prodname_copilot_short %}'s environment by:
+You can customize {% data variables.product.prodname_copilot_short %}'s environment to:
 
-* [Preinstalling tools or dependencies in {% data variables.product.prodname_copilot_short %}'s environment](#preinstalling-tools-or-dependencies-in-copilots-environment).
-* [Upgrading from standard {% data variables.product.prodname_dotcom %}-hosted {% data variables.product.prodname_actions %} runners to larger runners](#upgrading-to-larger-github-hosted-github-actions-runners).
-* [Disabling or customizing the agent's firewall](/copilot/customizing-copilot/customizing-or-disabling-the-firewall-for-copilot-coding-agent).
+* [Preinstall tools or dependencies in {% data variables.product.prodname_copilot_short %}'s environment](#preinstalling-tools-or-dependencies-in-copilots-environment).
+* [Upgrade from standard {% data variables.product.github %}-hosted {% data variables.product.prodname_actions %} runners to larger runners](#upgrading-to-larger-github-hosted-github-actions-runners).
+* [Enable Git Large File Storage (LFS)](#enabling-git-large-file-storage-lfs)
+* [Disable or customize the agent's firewall](/copilot/customizing-copilot/customizing-or-disabling-the-firewall-for-copilot-coding-agent).
 
 ## Preinstalling tools or dependencies in {% data variables.product.prodname_copilot_short %}'s environment
 
@@ -41,8 +42,16 @@ Here is a simple example of a `copilot-setup-steps.yml` file for a TypeScript pr
 ```yaml copy
 name: "Copilot Setup Steps"
 
-# Allow testing of the setup steps from your repository's "Actions" tab.
-on: workflow_dispatch
+# Automatically run the setup steps when they are changed to allow for easy validation, and
+# allow manual testing through the repository's "Actions" tab
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
 
 jobs:
   # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
@@ -83,7 +92,9 @@ In your `copilot-setup-steps.yml` file, you can only customize the following set
 
 For more information on these options, see [AUTOTITLE](/actions/writing-workflows/workflow-syntax-for-github-actions#jobs).
 
-Once you have created a `copilot-setup-steps.yml` file and merged it into your default branch, you can manually run the workflow from the repository's **Actions** tab to check that it works. For more information, see [AUTOTITLE](/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/manually-running-a-workflow).
+Your `copilot-setup-steps.yml` file will automatically be run as a normal {% data variables.product.prodname_actions %} workflow when changes are made, so you can see if it runs successfully. This will show alongside other checks in a pull request where you create or modify the file.
+
+Once you have merged the yml file into your default branch, you can manually run the workflow from the repository's **Actions** tab at any time to check that everything works as expected. For more information, see [AUTOTITLE](/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/manually-running-a-workflow).
 
 ## Upgrading to larger {% data variables.product.prodname_dotcom %}-hosted {% data variables.product.prodname_actions %} runners
 
@@ -105,9 +116,29 @@ jobs:
 ```
 
 > [!NOTE]
-> * {% data variables.copilot.copilot_coding_agent %} is only compatible with Ubuntu x86 Linux runners. Runners with Windows, macOS or other operating systems are not supported.
+> * {% data variables.copilot.copilot_coding_agent %} is only compatible with Ubuntu x64 Linux runners. Runners with Windows, macOS or other operating systems are not supported.
 > * Self-hosted {% data variables.product.prodname_actions %} runners are not supported.
 
+## Enabling Git Large File Storage (LFS)
+
+If you use Git Large File Storage (LFS) to store large files in your repository, you will need to customize {% data variables.product.prodname_copilot_short %}'s environment to install Git LFS and fetch LFS objects.
+
+To enable Git LFS, add a `actions/checkout` step to your `copilot-setup-steps` job with the `lfs` option set to `true`.
+
+```yaml copy
+# ...
+
+jobs:
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read # for actions/checkout
+    steps:
+      - uses: {% data reusables.actions.action-checkout %}
+        with:
+          lfs: true
+```
+
 ## Further reading
 
 * [AUTOTITLE](/copilot/customizing-copilot/customizing-or-disabling-the-firewall-for-copilot-coding-agent)

content/copilot/using-github-copilot/ai-models/choosing-the-right-ai-model-for-your-task.md

@@ -29,8 +29,8 @@ You can click a model name in the list below to jump to a detailed overview of i
 * [{% data variables.copilot.copilot_o3 %}](#o3)
 * [{% data variables.copilot.copilot_o3_mini %}](#o3-mini)
 * [{% data variables.copilot.copilot_o4_mini %}](#o4-mini)
-* [{% data variables.copilot.copilot_claude_sonnet_35 %}](#claude-35-sonnet)
-* [{% data variables.copilot.copilot_claude_sonnet_37 %}](#claude-37-sonnet)
+* [{% data variables.copilot.copilot_claude_sonnet_35 %}](#claude-sonnet-35)
+* [{% data variables.copilot.copilot_claude_sonnet_37 %}](#claude-sonnet-37)
 * [{% data variables.copilot.copilot_claude_sonnet_40 %}](#claude-sonnet-4)
 * [{% data variables.copilot.copilot_claude_opus %}](#claude-opus-4)
 * [{% data variables.copilot.copilot_gemini_flash %}](#gemini-20-flash)

content/discussions/managing-discussions-for-your-community/managing-discussions.md

@@ -159,16 +159,10 @@ To transfer a discussion, you must have permissions to create discussions in the
 1. At the bottom of the discussion, below the comment box, click **Close discussion**.
 1. Optionally, to change the reason for closing the discussion, select the {% octicon "triangle-down" aria-label="The down triangle octicon" %} dropdown next to "Close discussion" and click a reason.
 
-<!-- expires 2025-06-06 -->
-
-<!-- When this expires, remove the Converting issues based on labels section for FPT/GHEC but keep it for GHES <=3.17 -->
-
-{% ifversion fpt or ghec %}
+{% ifversion ghes < 3.18 %}
 
 ## Converting issues based on labels
 
->[!WARNING] Starting June 6, 2025, {% data variables.product.company_short %} will deprecate bulk converting of issues based on labels.
-
 You can convert all issues with the same label to discussions in bulk. Future issues with this label will also automatically convert to the discussion and category you configure.
 
 1. Navigate to the main page of the repository or, for organization discussions, the source repository.
@@ -179,4 +173,3 @@ You can convert all issues with the same label to discussions in bulk. Future is
 1. Click **I understand, convert this issue to a discussion**.
 
 {% endif %}
-<!-- end expires 2025-06-06 -->

content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md

@@ -78,9 +78,9 @@ If your organization has a security team, you can use the security manager role
 
 ### {% data variables.product.prodname_github_app %} managers
 
-By default, only organization owners can manage the settings of {% data variables.product.prodname_github_app %} registrations owned by an organization. To allow additional users to manage {% data variables.product.prodname_github_app %} registrations owned by an organization, an owner can grant them {% data variables.product.prodname_github_app %} manager permissions.
+By default, only organization owners can manage the settings of {% data variables.product.prodname_github_app %} registrations owned by an organization. To allow additional users{% ifversion org-app-manager-teams %} or teams{% endif %} to manage {% data variables.product.prodname_github_app %} registrations owned by an organization, an owner can grant them {% data variables.product.prodname_github_app %} manager permissions.
 
-When you designate a user as a {% data variables.product.prodname_github_app %} manager in your organization, you can grant them access to manage the settings of some or all {% data variables.product.prodname_github_app %} registrations owned by the organization. The {% data variables.product.prodname_github_app %} manager role does not grant users access to install and uninstall {% data variables.product.prodname_github_apps %} on an organization. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/adding-and-removing-github-app-managers-in-your-organization).
+When you designate a user{% ifversion org-app-manager-teams %} or team{% endif %} as a {% data variables.product.prodname_github_app %} manager in your organization, you can grant them access to manage the settings of some or all {% data variables.product.prodname_github_app %} registrations owned by the organization. The {% data variables.product.prodname_github_app %} manager role does not grant users access to install and uninstall {% data variables.product.prodname_github_apps %} on an organization. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/adding-and-removing-github-app-managers-in-your-organization).
 
 ### Outside collaborators{% ifversion repository-collaborators %} or repository collaborators{% endif %}
 

content/organizations/managing-programmatic-access-to-your-organization/adding-and-removing-github-app-managers-in-your-organization.md

@@ -25,34 +25,44 @@ shortTitle: GitHub App managers
 
 {% data reusables.apps.github-app-managers %}
 
-## Giving someone the ability to manage all {% data variables.product.prodname_github_apps %} owned by the organization
+## Granting the ability to manage all {% data variables.product.prodname_github_apps %} owned by the organization
 
+{%- ifversion org-app-manager-teams %}
+To assign the App Manager organization role to a user or team, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/using-organization-roles#assigning-an-organization-role).
+
+Use the role assignments page to see who has been granted this and any other organization role. Organization owners can always manage {% data variables.product.prodname_github_apps %} and are not shown in this view.
+{%- else %}
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.github-apps-settings-sidebar %}
 1. At the bottom of the "Management" section, in the search field, type the username of the person you want to designate as a {% data variables.product.prodname_github_app %} manager in the organization, then click **Grant**.
+{%- endif %}
 
-## Giving someone the ability to manage an individual {% data variables.product.prodname_github_app %}
+## Granting the ability to manage an individual {% data variables.product.prodname_github_app %}
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.github-apps-settings-sidebar %}
 1. Under "{% data variables.product.prodname_github_apps %}", click on the avatar of the app you'd like to add a {% data variables.product.prodname_github_app %} manager for.
 {% data reusables.organizations.app-managers-settings-sidebar %}
-1. At the bottom of the "App managers" section, in the search field, type the username of the person you want to designate as a GitHub App manager for the app, then click **Grant**.
+1. At the bottom of the "App managers" section, in the search field, type the username of the person{%- ifversion org-app-manager-teams %} or team{%- endif %} you want to designate as a GitHub App manager for the app, then click **Grant**.
 
 ## Removing a {% data variables.product.prodname_github_app %} manager's permissions for the entire organization
 
+{%- ifversion org-app-manager-teams %}
+See [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/using-organization-roles#deleting-an-organization-role-assignment) for directions on removing the App Manager role from a user or team.
+{%- else %}
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.github-apps-settings-sidebar %}
 1. Under "Management", next to the person you want to remove {% data variables.product.prodname_github_app %} manager permissions from, click **Revoke**.
+{%- endif %}
 
-## Removing a {% data variables.product.prodname_github_app %} manager's permissions for an individual {% data variables.product.prodname_github_app %}
+## Removing managers from an individual {% data variables.product.prodname_github_app %}
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.github-apps-settings-sidebar %}
 1. Under "{% data variables.product.prodname_github_apps %}", click on the avatar of the app you'd like to remove a {% data variables.product.prodname_github_app %} manager from.
 {% data reusables.organizations.app-managers-settings-sidebar %}
-1. Under "App managers", next to the person you want to remove {% data variables.product.prodname_github_app %} manager permissions from, click **Revoke**.
+1. Under "App managers", next to the person{%- ifversion org-app-manager-teams %} or team{%- endif %} you want to remove {% data variables.product.prodname_github_app %} manager permissions from, click **Revoke**.

data/features/org-app-manager-teams.yml

@@ -0,0 +1,5 @@
+# Issue https://github.com/github/releases/issues/6052
+versions:
+  ghec: '*'
+  fpt: '*'
+  ghes: '>=3.18'

data/reusables/apps/github-app-managers.md

@@ -1,3 +1,3 @@
-Organization owners can designate other users in their organization as {% data variables.product.prodname_github_app %} managers. {% data variables.product.prodname_github_app %} managers can manage the settings of some or all of the {% data variables.product.prodname_github_app %} registrations that are owned by the organization. The {% data variables.product.prodname_github_app %} manager role does not grant users access to install and uninstall {% data variables.product.prodname_github_apps %} on an organization. For more information about the specific app settings that a {% data variables.product.prodname_github_app %} manager can control, see [AUTOTITLE](/apps/maintaining-github-apps/modifying-a-github-app).
+Organization owners can designate other users{% ifversion org-app-manager-teams %} or teams{% endif %} in their organization as {% data variables.product.prodname_github_app %} managers. {% data variables.product.prodname_github_app %} managers can manage the settings of some or all of the {% data variables.product.prodname_github_app %} registrations that are owned by the organization. The {% data variables.product.prodname_github_app %} manager role does not grant recipients access to install and uninstall {% data variables.product.prodname_github_apps %} on an organization. For more information about the specific app settings that {% data variables.product.prodname_github_app %} managers can control, see [AUTOTITLE](/apps/maintaining-github-apps/modifying-a-github-app).
 
 For more information about {% data variables.product.prodname_github_app %} manager permissions, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#github-app-managers).

data/reusables/organizations/pre-defined-organization-roles.md

@@ -11,3 +11,6 @@ The current set of pre-defined roles are:
 * **CI/CD admin:** Grants admin access to manage Actions policies, runners, runner groups, hosted compute network configurations, secrets, variables, and usage metrics for an organization.
 * **Security manager**: Grants the ability to manage security policies, security alerts, and security configurations for an organization and all its repositories.
 {%- endif %}
+{%- ifversion org-app-manager-teams %}
+* **App Manager:**  Grants the ability to create, edit, and delete all GitHub Apps in an organization.
+{%- endif %}

data/variables/copilot.yml

@@ -97,8 +97,8 @@ max-chat-indexed-repos: '50'
 # Claude:
 copilot_claude: 'Claude'
 copilot_claude_sonnet: 'Claude Sonnet'
-copilot_claude_sonnet_35: 'Claude 3.5 Sonnet'
-copilot_claude_sonnet_37: 'Claude 3.7 Sonnet'
+copilot_claude_sonnet_35: 'Claude Sonnet 3.5'
+copilot_claude_sonnet_37: 'Claude Sonnet 3.7'
 copilot_claude_sonnet_40: 'Claude Sonnet 4'
 copilot_claude_opus: 'Claude Opus 4'
 # Gemini: