diff --git a/content/admin/guides.md b/content/admin/guides.md index 2ecdbef14d16..bca7cb304e38 100644 --- a/content/admin/guides.md +++ b/content/admin/guides.md @@ -119,7 +119,7 @@ includeGuides: - /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-projects-using-jira - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise - - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise + - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/abilities-of-roles - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise - /admin/user-management/managing-repositories-in-your-enterprise/migrating-to-internal-repositories diff --git a/content/admin/index.md b/content/admin/index.md index f4fc0207cb3e..7024c5f31679 100644 --- a/content/admin/index.md +++ b/content/admin/index.md @@ -73,7 +73,7 @@ featuredLinks: startHere: - '{% ifversion ghec %}/admin/managing-iam/understanding-iam-for-enterprises/choosing-an-enterprise-type-for-github-enterprise-cloud{% endif %}' - /admin/managing-iam/understanding-iam-for-enterprises/about-identity-and-access-management - - '{% ifversion ghec %}/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise{% endif %}' + - '{% ifversion ghec %}/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/abilities-of-roles{% endif %}' - /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise - '{% ifversion ghes %}/admin/getting-started-with-enterprise/about-upgrades-to-new-releases{% endif %}' - '{% ifversion ghes %}/billing/how-tos/set-up-payment/manage-enterprise-invoice{% endif %}' diff --git a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/custom-organization-roles.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/custom-organization-roles.md new file mode 100644 index 000000000000..4b136bdcb734 --- /dev/null +++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/custom-organization-roles.md @@ -0,0 +1,25 @@ +--- +title: Creating custom organization roles in an enterprise +intro: Create roles with fine-grained permissions for a consistent experience across your organizations. +versions: + feature: ent-owner-custom-org-roles +type: how_to +topics: + - Enterprise + - Organizations +shortTitle: Custom organization roles +--- + +To define consistent sets of permissions for settings and repositories, you can create custom organization roles for use in all of the enterprise's organizations. This allows centralized management of common roles such as "Developer" or "SRE team." + +Custom organization roles created at the enterprise level use the same organization and repository permissions and base roles as roles created at the organization level. There is no difference in how these roles function or what they can allow. For more information, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles). + +Enterprise owners can create and edit custom organization roles, but cannot assign them. Organization owners can assign custom roles in an organization. + +>[!NOTE] An enterprise can create up to 20 custom organization roles. This limit applies to the enterprise: each organization can also create up to 20 custom organization roles. + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.people-tab %} +1. In the left sidebar, select **Organization roles**. +1. Click **Create custom role**. +1. Enter the details, then click **Create role**. diff --git a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/index.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/index.md index fcc9b8874804..1b8f15370945 100644 --- a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/index.md +++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/index.md @@ -25,6 +25,7 @@ children: - /configuring-visibility-for-organization-membership - /preventing-users-from-creating-organizations - /requiring-two-factor-authentication-for-an-organization + - /custom-organization-roles - /managing-your-role-in-an-organization-owned-by-your-enterprise - /managing-requests-for-copilot-business-from-organizations-in-your-enterprise - /removing-organizations-from-your-enterprise diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/abilities-of-roles.md similarity index 59% rename from content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/abilities-of-roles.md index 3a4659a63551..45776e529574 100644 --- a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md +++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/abilities-of-roles.md @@ -1,6 +1,7 @@ --- -title: Roles in an enterprise -intro: "Learn which roles you can assign to control access to your enterprise's settings and data." +title: Abilities of roles in an enterprise +intro: Learn which roles you can assign to control access to your enterprise's settings and data. +shortTitle: Capabilities of roles redirect_from: - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/roles-in-an-enterprise - /github/setting-up-and-managing-your-enterprise-account/roles-for-an-enterprise-account @@ -8,11 +9,14 @@ redirect_from: - /articles/roles-for-an-enterprise-account - /github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise - /admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise + - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise versions: ghec: '*' ghes: '*' topics: - Enterprise +allowTitleToDifferFromFilename: true +contentType: reference --- ## About roles in an enterprise @@ -35,33 +39,6 @@ All users that are part of your enterprise have one of the following roles. People with collaborator access to repositories are listed in your enterprise's "People" tab, but are not enterprise members and do not have access to the enterprise. See {% ifversion ghec %}[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators-or-repository-collaborators).{% else %}[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators).{% endif %} -## How do I assign roles? - -{% ifversion ghec %} -If you use an **enterprise with personal accounts**: - -* People become enterprise members when they are added as a member or owner of an organization. See [AUTOTITLE](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization). -* You can invite someone to become an enterprise owner or billing manager. See [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise). - -If you use an **{% data variables.enterprise.prodname_emu_enterprise %}**: - -* You must provision all users through your identity provider (IdP). -* You select each user's enterprise role using your IdP. The role cannot be changed on {% data variables.product.prodname_dotcom %}. -* To assign the guest collaborator role, you may need to update your IdP. - -For more information about the different types of enterprise accounts, see [AUTOTITLE](/admin/identity-and-access-management/understanding-iam-for-enterprises/choosing-an-enterprise-type-for-github-enterprise-cloud#about-types-of-enterprises). - -{% elsif ghes %} - -When a user has joined your {% data variables.product.prodname_ghe_server %} instance, you can: - -* Add the user to an organization. See [AUTOTITLE](/organizations/managing-membership-in-your-organization/adding-people-to-your-organization). -* Invite the user to become an enterprise owner. See [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise). - -If you provision users with SCIM, you assign each user's enterprise role on your identity provider (IdP). The role cannot be changed on {% data variables.product.prodname_dotcom %}. - -{% endif %} - ## Enterprise owners Enterprise owners have complete control over the enterprise and can take every action, including: @@ -70,8 +47,8 @@ Enterprise owners have complete control over the enterprise and can take every a * {% ifversion ghec %}Adding and removing {% elsif ghes %}Managing{% endif %} organizations{% ifversion remove-enterprise-members %} * Removing enterprise members from all organizations{% endif %} * Managing enterprise settings -* Enforcing policy across organizations -{% ifversion ghec %}- Managing billing settings{% endif %} +* Enforcing policy across organizations{% ifversion ghec %} +* Managing billing settings{% endif %} For security, we recommend making **only a few people** enterprise owners. @@ -128,17 +105,6 @@ You can add unaffiliated users from your identity provider (for {% data variable {% endif %} -## Custom organization roles - -With {% data variables.product.prodname_ghe_cloud %} and starting from {% data variables.product.prodname_ghe_server %} 3.19, enterprise owners can create custom organization roles for use in all of the enterprise's organizations. This allows centralized management of common roles such as "Developer" or "SRE team". Only enterprise owners can create or edit these roles, and any organization owner or user with the "Manage organization roles" permission can assign them in an organization. - -When creating an organization role, enterprise owners can use the same organization and repository permissions and base roles as organization owners—there is no difference in how these roles function or what they can allow. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.people-tab %} -1. Select the "Organization Roles" section in the left-hand menu. -1. Create a new role using the "Create custom role" button, or edit an existing role using the ellipsis menu (...). - -See [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles) for more information about creating and assigning custom organization roles. +## Next steps -At this time, up to 20 custom organization roles can be created by the enterprise. This limit is only for the enterprise - each organization can also create up to 20 custom organization roles. +When you have decided which roles your users require, assign the roles to them. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/assign-roles). diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/assign-roles.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/assign-roles.md new file mode 100644 index 000000000000..8fea2e45bef3 --- /dev/null +++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/assign-roles.md @@ -0,0 +1,41 @@ +--- +title: Assigning roles to users in an enterprise +intro: Assign roles to govern what people can do in your enterprise. +versions: + ghec: '*' + ghes: '*' +type: how_to +shortTitle: Assign roles +--- + +Users in an enterprise have roles for the enterprise and for organizations where they have access. For more information, see [AUTOTITLE](/admin/overview/about-roles). + +## Assigning enterprise roles + +{% ifversion ghec %} +If you use an **enterprise with personal accounts**: + +* People become enterprise members when they are added as a member or owner of an organization. See [AUTOTITLE](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization). +* You can invite someone to become an enterprise owner or billing manager. See [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise). +* You can add people as unaffiliated users without adding them to the enterprise. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/invite-users-directly). + +If you use an **{% data variables.enterprise.prodname_emu_enterprise %}**: + +* You must provision all users through your identity provider (IdP). +* You select each user's enterprise role using your IdP. The role cannot be changed on {% data variables.product.prodname_dotcom %}. +* To assign the guest collaborator role, you may need to update your IdP. + +{% elsif ghes %} + +When a user has joined your {% data variables.product.prodname_ghe_server %} instance, you can: + +* Add the user to an organization. See [AUTOTITLE](/organizations/managing-membership-in-your-organization/adding-people-to-your-organization). +* Invite the user to become an enterprise owner. See [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise). + +If you provision users with SCIM, you assign each user's enterprise role on your identity provider (IdP). The role cannot be changed on {% data variables.product.prodname_dotcom %}. + +{% endif %} + +## Assigning organization roles + +Organization administrators can assign roles to users and teams in their organization. See [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/using-organization-roles#assigning-an-organization-role). diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md index 2e7d0bd62419..ba97a322df72 100644 --- a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md +++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md @@ -17,10 +17,11 @@ versions: topics: - Enterprise children: - - /roles-in-an-enterprise + - /abilities-of-roles - /best-practices-for-user-security - /create-enterprise-teams - /invite-users-directly + - /assign-roles - /inviting-people-to-manage-your-enterprise - /managing-invitations-to-organizations-within-your-enterprise - /managing-organization-members-in-your-enterprise @@ -42,3 +43,4 @@ children: - /enabling-guest-collaborators shortTitle: Manage users --- + diff --git a/content/admin/overview/about-roles.md b/content/admin/overview/about-roles.md new file mode 100644 index 000000000000..affcb2738c12 --- /dev/null +++ b/content/admin/overview/about-roles.md @@ -0,0 +1,46 @@ +--- +title: About roles in an enterprise +intro: 'Learn how roles allow you to control people''s access to your enterprise''s settings and resources.' +versions: + ghec: '*' + ghes: '*' +shortTitle: About roles +type: overview +topics: + - Enterprise + - Fundamentals +--- + +## What are roles? + +A role is a set of permissions that you can assign to individuals or teams. A permission is the ability to perform a specific action, such as changing billing settings. + +A user in an enterprise has a role for both the enterprise account itself and for each individual organization in the enterprise. + +* The enterprise-level role defines the user's access to enterprise settings, and to internal repositories across the enterprise. +* Organization-level roles define the user's access to organization settings and repositories in that organization. + +## Predefined and custom roles for organizations + +Organization roles can be **predefined** or **custom**. + +* Predefined roles, such as organization owner or billing manager, grant blanket permissions to users or teams. They may contain more permissions than someone needs to do their job. +* Custom roles include fine-grained permissions for organization settings and repository access. They allow you to follow the principle of least privilege by giving teams just the access they need to do their jobs. For example, you could allow a team to view your audit logs without allowing them to change policies. + +We recommend using custom roles wherever possible. However, if a predefined role meets your needs, this is the quickest way to grant permissions. + +## Who can assign roles? + +Enterprise roles are assigned when a user is invited to the enterprise (personal accounts) or provisioned from an identity provider.{% ifversion ent-owner-custom-org-roles %} Enterprise owners can also create custom organization roles to be used across organizations, but these roles can only be assigned by organization administrators.{% endif %} + +Organization administrators can grant organization roles and create custom organization roles, but can't affect roles at the enterprise level. + +## Next steps + +Review the predefined roles and fine-grained permissions available with custom organization roles, and plan out what roles will be required for your teams to do their jobs on {% data variables.product.github %}. + +* [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/abilities-of-roles) +* [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#about-organization-roles) +* [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles#permissions-for-organization-access) + +To ensure continued access, we recommend giving the enterprise owner role to at least two people, and the organization owner role to at least two people per organization. However, you should grant most teams only the minimum level of access they require. diff --git a/content/admin/overview/index.md b/content/admin/overview/index.md index b03a4b810c1e..5816b87387e4 100644 --- a/content/admin/overview/index.md +++ b/content/admin/overview/index.md @@ -20,6 +20,7 @@ children: - /establishing-a-governance-framework-for-your-enterprise - /accessing-compliance-reports-for-your-enterprise - /about-teams + - /about-roles --- For more information, or to purchase {% data variables.product.prodname_enterprise %}, see [{% data variables.product.prodname_enterprise %}](https://github.com/enterprise). 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 1ed8986c09d3..d1342e3ff416 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 @@ -65,6 +65,14 @@ This version of this article is for using repository custom instructions in Xcod {% endxcode %} +{% copilotcli %} + +This version of this article is for using repository custom instructions with the {% data variables.product.prodname_copilot %} CLI. Click the tabs above for instructions on using custom instructions in other environments. + +{% data reusables.copilot.repository-custom-instructions-prerequisites %} + +{% endcopilotcli %} + {% eclipse %} > [!NOTE] This feature is currently in {% data variables.release-phases.public_preview %} and is subject to change. @@ -197,9 +205,45 @@ Once saved, these instructions will apply to the current project in Eclipse that {% endeclipse %} +{% copilotcli %} + +{% data variables.product.prodname_copilot %} supports three types of repository custom instructions. See the table above for details of which {% data variables.product.prodname_copilot %} features support these types of instructions. + +* **Repository-wide custom instructions**, which apply to all requests made in the context of a repository. + + These are specified in a `copilot-instructions.md` file in the `.github` directory of the repository. See [Creating repository-wide custom instructions](#creating-repository-wide-custom-instructions). + +* **Path-specific custom instructions**, which apply to requests made in the context of files that match a specified path. + + These are specified in one or more `NAME.instructions.md` files within the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions). + + If the path you specify matches a file that {% data variables.product.prodname_copilot_short %} is working on, and a repository-wide custom instructions file also exists, then the instructions from both files are used. You should avoid potential conflicts between instructions as {% data variables.product.prodname_copilot_short %}'s choice between conflicting instructions is non-deterministic. + +* **Agent instructions** are used by AI agents. + + You can create one or more `AGENTS.md` files, stored anywhere within the repository. When {% data variables.product.prodname_copilot_short %} is working, the nearest `AGENTS.md` file in the directory tree will take precedence. For more information, see the [openai/agents.md repository](https://github.com/openai/agents.md). + + Alternatively, you can use a single `CLAUDE.md` or `GEMINI.md` file stored in the root of the repository. + +## Creating repository-wide custom instructions + +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. + +1. Add natural language instructions to the file, in Markdown format. + + Whitespace between instructions is ignored, so the instructions can be written as a single paragraph, each on a new line, or separated by blank lines for legibility. + +## Creating path-specific custom instructions + +{% data reusables.copilot.custom-instructions-path %} + +{% endcopilotcli %} + {% vscode %} -{% data variables.product.prodname_vscode_shortname %} supports two types of repository custom instructions: +{% data variables.product.prodname_vscode_shortname %} supports three types of repository custom instructions. See the table above for details of which {% data variables.product.prodname_copilot %} features support these types of instructions. * **Repository-wide custom instructions**, which apply to all requests made in the context of a repository. @@ -211,6 +255,10 @@ Once saved, these instructions will apply to the current project in Eclipse that If the path you specify matches a file that {% data variables.product.prodname_copilot_short %} is working on, and a repository-wide custom instructions file also exists, then the instructions from both files are used. +* **Agent instructions** are used by AI agents. + + For {% data variables.copilot.copilot_chat_short %} in {% data variables.product.prodname_vscode_shortname %}, instructions must be in a file called `AGENTS.md` in the root of the workspace. For more information, see the [openai/agents.md repository](https://github.com/openai/agents.md). + ## Creating repository-wide custom instructions 1. In the root of your repository, create a file named `.github/copilot-instructions.md`. @@ -243,26 +291,20 @@ Once saved, these instructions will apply to the current project in Eclipse that {% webui %} -You can create several types of repository custom instructions for use on {% data variables.product.prodname_dotcom_the_website %}: +{% data variables.product.prodname_copilot_short %} on {% data variables.product.github %} supports three types of repository custom instructions. See the table above for details of which {% data variables.product.prodname_copilot %} features support these types of instructions. * **Repository-wide custom instructions** apply to all requests made in the context of a repository. - Supported by: **{% data variables.copilot.copilot_chat_short %}**, **{% data variables.copilot.copilot_coding_agent %}**, and **{% data variables.copilot.copilot_code-review_short %}**. - These are specified in a `copilot-instructions.md` file in the `.github` directory of the repository. See [Creating repository-wide custom instructions](#creating-repository-wide-custom-instructions-1). * **Path-specific custom instructions** apply to requests made in the context of files that match a specified path. - Supported by: **{% data variables.copilot.copilot_coding_agent %}** and **{% data variables.copilot.copilot_code-review_short %}**. - These are specified in one or more `NAME.instructions.md` files within the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions-1). If the path you specify matches a file that {% data variables.product.prodname_copilot_short %} is working on, and a repository-wide custom instructions file also exists, then the instructions from both files are used. * **Agent instructions** are used by AI agents. - Supported by: **{% data variables.copilot.copilot_coding_agent %}** and {% data variables.copilot.copilot_cli_short %}. - You can create one or more `AGENTS.md` files, stored anywhere within the repository. When {% data variables.product.prodname_copilot_short %} is working, the nearest `AGENTS.md` file in the directory tree will take precedence. For more information, see the [openai/agents.md repository](https://github.com/openai/agents.md). Alternatively, you can use a single `CLAUDE.md` or `GEMINI.md` file stored in the root of the repository. @@ -453,7 +495,7 @@ Answer all questions in less than 1000 characters, and words of no more than 12 ## Repository custom instructions in use -The instructions in the file(s) are available for use by {% data variables.copilot.copilot_chat_short %} as soon as you save the file(s). The complete set of instructions will be automatically added to requests that you submit to {% data variables.product.prodname_copilot_short %} in the context of that repository. For example, they are added to the prompt you submit to {% data variables.copilot.copilot_chat_short %}. +The instructions in the file(s) are available for use by {% data variables.product.prodname_copilot_short %} as soon as you save the file(s). The complete set of instructions will be automatically added to requests that you submit to {% data variables.product.prodname_copilot_short %} in the context of that repository. For example, they are added to the prompt you submit to {% data variables.copilot.copilot_chat_short %}. {% webui %} diff --git a/content/copilot/tutorials/speed-up-development-work.md b/content/copilot/tutorials/speed-up-development-work.md index 5f3da457e518..e1b953494210 100644 --- a/content/copilot/tutorials/speed-up-development-work.md +++ b/content/copilot/tutorials/speed-up-development-work.md @@ -67,6 +67,18 @@ In situations where people tend to ask similar questions, such as how authentica **Suggested prompt**: > How does SSO work? +## Hands-on practice + +Try the [Democratize team knowledge using Copilot Spaces](https://github.com/skills/democratize-team-knowledge-using-copilot-spaces) Skills exercise for practical experience to do the following: +* Centralize scattered project management knowledge in Copilot Spaces +* Convert tacit team insights into searchable, versioned artifacts +* Give all team members equal access to processes, decisions, and rationale +* Connect a repository as a structured knowledge source +* Extract, refine, and standardize workflows collaboratively +* Feed validated improvements back into living documentation +* Accelerate onboarding and reduce single-person dependency risk +* Enable consistent, repeatable project execution + ## Next steps Once you’ve created a space to help with development tasks, consider sharing it with your team to reduce handoffs and repeated questions. See [AUTOTITLE](/copilot/using-github-copilot/copilot-spaces/collaborating-with-your-team-using-copilot-spaces). diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md index 009c9a4b24b3..aaa11118ece9 100644 --- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md @@ -6,7 +6,6 @@ versions: topics: - Organizations shortTitle: Custom organization roles -permissions: 'Organization owners and users with the "Manage custom organization roles" permission' product: 'Organizations on {% data variables.product.prodname_ghe_cloud %}{% ifversion ghes %} and {% data variables.product.prodname_ghe_server %}{% endif %}' --- diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-organization-roles.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-organization-roles.md index 7d757dd612c7..a37d97af68d4 100644 --- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-organization-roles.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-organization-roles.md @@ -22,13 +22,27 @@ To{% ifversion org-pre-defined-roles %} view organization role permissions and{% ## Creating a custom role -Organization owners and users with the "Manage custom organization roles" permission can create up to 20 custom organization roles. On {% data variables.product.prodname_ghe_server %} earlier than 3.19, you can create up to 10. +{% ifversion ent-owner-custom-org-roles %}Enterprise owners, organization{% else %}Organization{% endif %} owners, and users with the "Manage custom organization roles" permission can create up to {% ifversion ent-owner-custom-org-roles %}20{% else %}10{% endif %} custom organization roles. + +{% ifversion ent-owner-custom-org-roles %} + +### In an organization + +{% endif %} {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.custom-org-roles-settings-step %} {% data reusables.organizations.custom-org-roles-create-new-step %} +{% ifversion ent-owner-custom-org-roles %} + +### In an enterprise + +Enterprise owners can define standard custom organization roles for their organization owners to assign. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/custom-organization-roles). + +{% endif %} + ## Editing a custom role {% data reusables.profile.access_org %} diff --git a/data/features/ent-owner-custom-org-roles.yml b/data/features/ent-owner-custom-org-roles.yml new file mode 100644 index 000000000000..82fdc055e188 --- /dev/null +++ b/data/features/ent-owner-custom-org-roles.yml @@ -0,0 +1,4 @@ +# Allows enterprise owners to create custom roles for organizations +versions: + ghec: '*' + ghes: '>3.18' diff --git a/data/reusables/copilot/repository-custom-instructions-support.md b/data/reusables/copilot/repository-custom-instructions-support.md index ee42aa314771..796bbfd8344f 100644 --- a/data/reusables/copilot/repository-custom-instructions-support.md +++ b/data/reusables/copilot/repository-custom-instructions-support.md @@ -10,7 +10,7 @@ The following table shows which {% data variables.product.prodname_copilot_short | | Eclipse | JetBrains IDEs | {% data variables.product.prodname_vs %} | {% data variables.product.prodname_vscode_shortname %} | {% data variables.product.prodname_dotcom_the_website %} | Xcode | | --- | --- | --- | --- | --- | --- | --- | -| {% data variables.copilot.copilot_chat_short %} | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 1 | +| {% data variables.copilot.copilot_chat_short %} | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 3 | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 1 | | {% data variables.copilot.copilot_coding_agent %} | N/A | N/A | N/A | {% octicon "check" aria-label="Included" %} 3 | {% octicon "check" aria-label="Included" %} 3 | N/A | | {% data variables.copilot.copilot_code-review_short %} | N/A | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} 1 | {% octicon "check" aria-label="Included" %} 2 | {% octicon "check" aria-label="Included" %} 2 | {% octicon "x" aria-label="Not included" %} | diff --git a/src/tools/lib/all-tools.ts b/src/tools/lib/all-tools.ts index 2c062cc02142..242d798ec749 100644 --- a/src/tools/lib/all-tools.ts +++ b/src/tools/lib/all-tools.ts @@ -15,6 +15,7 @@ export const allTools: ToolsMapping = { bash: 'Bash', cli: 'GitHub CLI', codespaces: 'Codespaces', + copilotcli: 'Copilot CLI', curl: 'curl', desktop: 'Desktop', eclipse: 'Eclipse',