From 6a02c74dcff5d34fac96c90fa900b9654ae885ba Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 17 Nov 2021 12:01:57 +0100 Subject: [PATCH 01/33] initial versioning changes --- .../documenting-your-project-with-wikis/about-wikis.md | 2 +- content/developers/index.md | 1 - content/github/index.md | 1 - .../removing-a-member-from-your-organization.md | 4 ++-- .../managing-the-forking-policy-for-your-organization.md | 8 +++----- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/content/communities/documenting-your-project-with-wikis/about-wikis.md b/content/communities/documenting-your-project-with-wikis/about-wikis.md index 9baf5f7702..7a3f22a721 100644 --- a/content/communities/documenting-your-project-with-wikis/about-wikis.md +++ b/content/communities/documenting-your-project-with-wikis/about-wikis.md @@ -19,7 +19,7 @@ Every repository on {% ifversion ghae %}{% data variables.product.product_name % With wikis, you can write content just like everywhere else on {% data variables.product.product_name %}. For more information, see "[Getting started with writing and formatting on {% data variables.product.prodname_dotcom %}](/articles/getting-started-with-writing-and-formatting-on-github)." We use [our open-source Markup library](https://github.com/github/markup) to convert different formats into HTML, so you can choose to write in Markdown or any other supported format. -{% ifversion fpt or ghes or ghec %}If you create a wiki in a public repository, the wiki is available to {% ifversion ghes %}anyone with access to {% data variables.product.product_location %}{% else %}the public{% endif %}. {% endif %}If you create a wiki in an internal or private repository, only {% ifversion fpt or ghes or ghec %}people{% elsif ghae %}enterprise members{% endif %} with access to the repository can access the wiki. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)." +{% ifversion fpt or ghes or ghec %}If you create a wiki in a public repository, the wiki is available to {% ifversion ghes %}anyone with access to {% data variables.product.product_location %}{% else %}the public{% endif %}. {% endif %}If you create a wiki in a{% ifversion ghec %}n internal or{% endif %} private repository, only {% ifversion fpt or ghes or ghec %}people{% elsif ghae %}enterprise members{% endif %} with access to the repository can access the wiki. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)." You can edit wikis directly on {% data variables.product.product_name %}, or you can edit wiki files locally. By default, only people with write access to your repository can make changes to wikis, although you can allow everyone on {% data variables.product.product_location %} to contribute to a wiki in {% ifversion ghae %}an internal{% else %}a public{% endif %} repository. For more information, see "[Changing access permissions for wikis](/communities/documenting-your-project-with-wikis/changing-access-permissions-for-wikis)". diff --git a/content/developers/index.md b/content/developers/index.md index 742e708baf..3959060072 100644 --- a/content/developers/index.md +++ b/content/developers/index.md @@ -12,4 +12,3 @@ children: - /apps - /github-marketplace --- - diff --git a/content/github/index.md b/content/github/index.md index 15156bc2c1..a526e281f2 100644 --- a/content/github/index.md +++ b/content/github/index.md @@ -22,4 +22,3 @@ children: - /site-policy-deprecated - /setting-up-and-managing-your-enterprise --- - diff --git a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md index 8baffb2381..94479856a0 100644 --- a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md @@ -23,8 +23,8 @@ Only organization owners can remove members from an organization. **Warning:** When you remove members from an organization: - The paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[Downgrading your organization's paid seats](/articles/downgrading-your-organization-s-paid-seats)." -- Removed members will lose access to private forks of your organization's private repositories, but they may still have local copies. However, they cannot sync local copies with your organization's repositories. Their private forks can be restored if the user is [reinstated as an organization member](/articles/reinstating-a-former-member-of-your-organization) within three months of being removed from the organization. Ultimately, you are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property. -- If your organization is owned by an enterprise account, removed members will also lose access to private forks of your organization's internal repositories, if the removed member is not a member of any other organization owned by the same enterprise account. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)." +- Removed members will lose access to private forks of your organization's private repositories, but they may still have local copies. However, they cannot sync local copies with your organization's repositories. Their private forks can be restored if the user is [reinstated as an organization member](/articles/reinstating-a-former-member-of-your-organization) within three months of being removed from the organization. Ultimately, you are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property.{% ifversion ghec %} +- Removed members will also lose access to private forks of your organization's internal repositories, if the removed member is not a member of any other organization owned by the same enterprise account. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)."{% endif %} - Any organization invitations sent by a removed member, that have not been accepted, are cancelled and will not be accessible. {% endwarning %} diff --git a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md index 661bb8ab17..c8f5f346eb 100644 --- a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md @@ -1,6 +1,6 @@ --- title: Managing the forking policy for your organization -intro: 'You can allow or prevent the forking of any private{% ifversion fpt or ghes or ghae or ghec %} and internal{% endif %} repositories owned by your organization.' +intro: 'You can allow or prevent the forking of any private{% ifversion ghes or ghae or ghec %} and internal{% endif %} repositories owned by your organization.' redirect_from: - /articles/allowing-people-to-fork-private-repositories-in-your-organization - /github/setting-up-and-managing-organizations-and-teams/allowing-people-to-fork-private-repositories-in-your-organization @@ -17,11 +17,9 @@ topics: shortTitle: Manage forking policy --- -By default, new organizations are configured to disallow the forking of private{% ifversion fpt or ghes or ghae or ghec %} and internal{% endif %} repositories. +By default, new organizations are configured to disallow the forking of private{% ifversion ghes or ghae or ghec %} and internal{% endif %} repositories. -If you allow forking of private{% ifversion fpt or ghes or ghae or ghec %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% ifversion fpt or ghes or ghae or ghec %} or internal{% endif %} repository. For more information, see "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." - -{% data reusables.organizations.internal-repos-enterprise %} +If you allow forking of private{% ifversion ghes or ghae or ghec %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% ifversion ghes or ghae or ghec %} or internal{% endif %} repository. For more information, see "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} From 0582c82608bf33400b031ee0514895a42dfa1b8c Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 17 Nov 2021 14:03:24 +0100 Subject: [PATCH 02/33] further versioning and image update --- .../repository/allow-disable-forking-fpt.png | Bin 0 -> 17966 bytes ...-the-forking-policy-for-your-organization.md | 8 +++++--- .../about-repositories.md | 2 +- .../deleting-a-repository.md | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 assets/images/help/repository/allow-disable-forking-fpt.png diff --git a/assets/images/help/repository/allow-disable-forking-fpt.png b/assets/images/help/repository/allow-disable-forking-fpt.png new file mode 100644 index 0000000000000000000000000000000000000000..59a3e2efc6771128839e990b6275d3caf1202f44 GIT binary patch literal 17966 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 G^?v~@bg0q* literal 0 HcmV?d00001 diff --git a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md index c8f5f346eb..e079a0cb3e 100644 --- a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md @@ -23,9 +23,11 @@ If you allow forking of private{% ifversion ghes or ghae or ghec %} and internal {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.member-privileges %} -5. Under "Repository forking", select **Allow forking of private repositories** or **Allow forking of private and internal repositories**. - ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-organization.png) +{% data reusables.organizations.member-privileges %}{% ifversion ghes or ghae or ghec %} +5. Under "Repository forking", select **Allow forking of private and internal repositories**. + ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-organization.png){% endif %}{% ifversion fpt %} +5. Under "Repository forking", select **Allow forking of private repositories**. + ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-fpt.png){% endif %} 6. Click **Save**. ## Further reading diff --git a/content/repositories/creating-and-managing-repositories/about-repositories.md b/content/repositories/creating-and-managing-repositories/about-repositories.md index a02b331fcb..62145a6170 100644 --- a/content/repositories/creating-and-managing-repositories/about-repositories.md +++ b/content/repositories/creating-and-managing-repositories/about-repositories.md @@ -60,7 +60,7 @@ Organization owners always have access to every repository created in an organiz People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." -{% ifversion fpt or ghae or ghes or ghec %} +{% ifversion ghae or ghes or ghec %} ## About internal repositories {% note %} diff --git a/content/repositories/creating-and-managing-repositories/deleting-a-repository.md b/content/repositories/creating-and-managing-repositories/deleting-a-repository.md index 647cf7c955..20ffb8519f 100644 --- a/content/repositories/creating-and-managing-repositories/deleting-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/deleting-a-repository.md @@ -24,8 +24,8 @@ topics: **Warnings**: - Deleting a repository will **permanently** delete release attachments and team permissions. This action **cannot** be undone. -- Deleting a private or internal repository will delete all forks of the repository. - +- Deleting a private{% ifversion not fpt %} or internal{% endif %} repository will delete all forks of the repository. + {% endwarning %} Some deleted repositories can be restored within 90 days of deletion. {% ifversion ghes or ghae %}Your site administrator may be able to restore a deleted repository for you. For more information, see "[Restoring a deleted repository](/admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository)." {% else %}For more information, see "[Restoring a deleted repository](/articles/restoring-a-deleted-repository)."{% endif %} From 4b8a58a8679fcbe04f066850b11ae271101131a4 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Thu, 18 Nov 2021 10:12:03 +0100 Subject: [PATCH 03/33] version about-repositories --- .../creating-and-managing-repositories/about-repositories.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/content/repositories/creating-and-managing-repositories/about-repositories.md b/content/repositories/creating-and-managing-repositories/about-repositories.md index 62145a6170..15696c0f97 100644 --- a/content/repositories/creating-and-managing-repositories/about-repositories.md +++ b/content/repositories/creating-and-managing-repositories/about-repositories.md @@ -46,14 +46,15 @@ You can use repositories to manage your work and collaborate with others. You can restrict who has access to a repository by choosing a repository's visibility: {% ifversion fpt or ghes or ghec %}public, internal, or private{% elsif ghae %}private or internal{% else %} public or private{% endif %}. -{% ifversion ghae %}When you create a repository owned by your user account, the repository is always private. When you create a repository owned by an organization, you can choose to make the repository private or internal.{% else %}When you create a repository, you can choose to make the repository public or private.{% ifversion fpt or ghes or ghec %} If you're creating the repository in an organization{% ifversion fpt or ghec %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %}{% endif %} +{% ifversion ghae %}When you create a repository owned by your user account, the repository is always private. When you create a repository owned by an organization, you can choose to make the repository private or internal.{% else %}When you create a repository, you can choose to make the repository public or private.{% ifversion ghes or ghec %} If you're creating the repository in an organization{% ifversion ghec %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %}{% endif %}{% ifversion fpt %} Repositories in organizations that use {% data variables.product.prodname_ghe_cloud %} can also be created with internal visibility. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)" in the {% data variables.product.prodname_ghe_cloud %} documentation. +{% endif %} {% ifversion ghes %} If {% data variables.product.product_location %} is not in private mode or behind a firewall, public repositories are accessible to everyone on the internet. Otherwise, public repositories are available to everyone using {% data variables.product.product_location %}, including outside collaborators. Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. {% ifversion ghes %} Internal repositories are accessible to enterprise members. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} {% elsif ghae %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to all enterprise members. For more information, see "[About internal repositories](#about-internal-repositories)." {% else %} -Public repositories are accessible to everyone on the internet. Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to enterprise members. For more information, see "[About internal repositories](#about-internal-repositories)." +Public repositories are accessible to everyone on the internet. Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to enterprise members. For more information, see "[About internal repositories](/enterprise-cloud@latest/repositories/creating-and-managing-repositories/about-repositories#about-internal-repositories)"{% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %} {% endif %} Organization owners always have access to every repository created in an organization. For more information, see "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)." From 2e2a33366a498d8cfb9602bb52d03127936c0b44 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Thu, 18 Nov 2021 10:59:37 +0100 Subject: [PATCH 04/33] more ghec versioning in repo docset --- .../classifying-your-repository-with-topics.md | 2 +- ...anaging-github-actions-settings-for-a-repository.md | 10 ++-------- .../private-repository-forks-overview.md | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md index b61e5c58c7..2a72b8bbe0 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md @@ -27,7 +27,7 @@ To browse the most used topics, go to https://github.com/topics/. Repository admins can add any topics they'd like to a repository. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% ifversion fpt or ghec %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Private repository content is not analyzed and does not receive topic suggestions.{% endif %} -{% ifversion ghae %}Internal {% else %}Public, internal, {% endif %}and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. +{% ifversion ghae %}Internal {% else %}Public{% ifversion not fpt %}, internal,{% endif %}{% endif %} and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. You can search for repositories that are associated with a particular topic. For more information, see "[Searching for repositories](/search-github/searching-on-github/searching-for-repositories#search-by-topic)." You can also search for a list of topics on {% data variables.product.product_name %}. For more information, see "[Searching topics](/search-github/searching-on-github/searching-topics)." diff --git a/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md index 1787956727..36462de836 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md @@ -109,16 +109,10 @@ The default permissions can also be configured in the organization settings. If 1. Click **Save** to apply the settings. {% endif %} -{% ifversion fpt or ghes > 3.3 or ghae-issue-4757 or ghec %} +{% ifversion ghes > 3.3 or ghae-issue-4757 or ghec %} ## Allowing access to components in an internal repository -{% note %} - -**Note:** {% data reusables.gated-features.internal-repos %} - -{% endnote %} - -Members of your enterprise can use internal repositories to work on projects without sharing information publicly. For information, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-internal-repositories)." +Members of your enterprise can use internal repositories to work on projects without sharing information publicly. For information, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-internal-repositories)." To configure whether workflows in an internal repository can be accessed from outside the repository: diff --git a/data/reusables/github-actions/private-repository-forks-overview.md b/data/reusables/github-actions/private-repository-forks-overview.md index b7fc22330a..afd4a76225 100644 --- a/data/reusables/github-actions/private-repository-forks-overview.md +++ b/data/reusables/github-actions/private-repository-forks-overview.md @@ -1,4 +1,4 @@ -If you rely on using forks of your private repositories, you can configure policies that control how users can run workflows on `pull_request` events. Available to private and internal repositories only, you can configure these policy settings for enterprises, organizations, or repositories. For enterprises, the policies are applied to all repositories in all organizations. +If you rely on using forks of your private repositories, you can configure policies that control how users can run workflows on `pull_request` events. Available to private {% ifversion not fpt %}and internal{% endif %} repositories only, you can configure these policy settings for {% ifversion not fpt %}enterprises, {% endif %}organizations, or repositories.{% ifversion not fpt %} For enterprises, the policies are applied to all repositories in all organizations.{% endif %} - **Run workflows from fork pull requests** - Allows users to run workflows from fork pull requests, using a `GITHUB_TOKEN` with read-only permission, and with no access to secrets. - **Send write tokens to workflows from pull requests** - Allows pull requests from forks to use a `GITHUB_TOKEN` with write permission. From 0695a4683c8d0674987b76d17e0fc206b8c1c384 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Thu, 18 Nov 2021 12:23:35 +0100 Subject: [PATCH 05/33] more ghec versioning in repo docset --- .../managing-the-forking-policy-for-your-repository.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository.md index cc124d180d..b5692be81c 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository.md @@ -1,6 +1,6 @@ --- title: Managing the forking policy for your repository -intro: 'You can allow or prevent the forking of a specific private{% ifversion fpt or ghae or ghes or ghec %} or internal{% endif %} repository owned by an organization.' +intro: 'You can allow or prevent the forking of a specific private{% ifversion ghae or ghes or ghec %} or internal{% endif %} repository owned by an organization.' redirect_from: - /articles/allowing-people-to-fork-a-private-repository-owned-by-your-organization - /github/administering-a-repository/allowing-people-to-fork-a-private-repository-owned-by-your-organization @@ -16,9 +16,7 @@ topics: - Repositories shortTitle: Manage the forking policy --- -An organization owner must allow forks of private{% ifversion fpt or ghae or ghes or ghec %} and internal{% endif %} repositories on the organization level before you can allow or disallow forks for a specific repository. For more information, see "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." - -{% data reusables.organizations.internal-repos-enterprise %} +An organization owner must allow forks of private{% ifversion ghae or ghes or ghec %} and internal{% endif %} repositories on the organization level before you can allow or disallow forks for a specific repository. For more information, see "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} From 878422092112848847d4d3e7ba2f6fd2e4943dda Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:08:11 +0100 Subject: [PATCH 06/33] versions internal repo out of fpt table --- .../security-overview/about-the-security-overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/code-security/security-overview/about-the-security-overview.md b/content/code-security/security-overview/about-the-security-overview.md index 84bd9c8b05..c7a00cdf47 100644 --- a/content/code-security/security-overview/about-the-security-overview.md +++ b/content/code-security/security-overview/about-the-security-overview.md @@ -27,7 +27,7 @@ You can use the security overview for a high-level view of the security status o The security overview indicates whether {% ifversion fpt or ghes > 3.1 or ghec %}security{% endif %}{% ifversion ghae-next %}{% data variables.product.prodname_GH_advanced_security %}{% endif %} features are enabled for repositories owned by your organization and consolidates alerts for each feature.{% ifversion fpt or ghes > 3.1 or ghec %} Security features include {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_secret_scanning %}, as well as {% data variables.product.prodname_dependabot_alerts %}.{% endif %} For more information about {% data variables.product.prodname_GH_advanced_security %} features, see "[About {% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security)."{% ifversion fpt or ghes > 3.1 or ghec %} For more information about {% data variables.product.prodname_dependabot_alerts %}, see "[About alerts for vulnerable dependencies](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)."{% endif %} -For more information about securing your code at the repository and organization levels, see "[Securing your repository](/code-security/getting-started/securing-your-repository)" and "[Securing your organization](/code-security/getting-started/securing-your-organization)." +For more information about securing your code at the repository and organization levels, see "[Securing your repository](/code-security/getting-started/securing-your-repository)" and "[Securing your organization](/code-security/getting-started/securing-your-organization)." In the security overview, you can view, sort, and filter alerts to understand the security risks in your organization and in specific repositories. You can apply multiple filters to focus on areas of interest. For example, you can identify private repositories that have a high number of {% data variables.product.prodname_dependabot_alerts %} or repositories that have no {% data variables.product.prodname_code_scanning %} alerts. @@ -106,8 +106,8 @@ The level of risk for a repository is determined by the number and severity of a | Qualifier | Description | | -------- | -------- |{% ifversion fpt or ghes > 3.1 or ghec %} -| `is:public` | Display public repositories. |{% endif %} -| `is:internal` | Display internal repositories. | +| `is:public` | Display public repositories. |{% endif %}{% ifversion not fpt %} +| `is:internal` | Display internal repositories. |{% endif %} | `is:private` | Display private repositories. | | `archived:true` | Display archived repositories. | From 1234426ab9a7253dd7654f0ba2e271451bdc9ae5 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Tue, 23 Nov 2021 07:47:02 +0100 Subject: [PATCH 07/33] Versions internal repo out of search filter articles for FPT --- .../repo-creation-perms-radio-buttons-fpt.png | Bin 0 -> 72858 bytes ...-repository-creation-in-your-organization.md | 7 +++---- .../searching-on-github/searching-commits.md | 4 ++-- .../searching-discussions.md | 4 ++-- .../searching-for-repositories.md | 4 ++-- .../searching-issues-and-pull-requests.md | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png diff --git a/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png b/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png new file mode 100644 index 0000000000000000000000000000000000000000..c651d72f9a43d5f25611412cb167c3334b74de24 GIT binary patch literal 72858 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 literal 0 HcmV?d00001 diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index 8e5bfa9283..94178a7494 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -27,11 +27,10 @@ Organization owners can always create any type of repository. {% endwarning %} -{% data reusables.organizations.internal-repos-enterprise %} - {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository creation", select one or more options. - ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png) +5. Under "Repository creation", select one or more options.{% ifversion not fpt %} + ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png){% endif %}{% ifversion fpt %} + ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png){% endif %} 6. Click **Save**. diff --git a/content/search-github/searching-on-github/searching-commits.md b/content/search-github/searching-on-github/searching-commits.md index 784d1b9e9d..2652e64d48 100644 --- a/content/search-github/searching-on-github/searching-commits.md +++ b/content/search-github/searching-on-github/searching-commits.md @@ -106,8 +106,8 @@ The `is` qualifier matches commits from repositories with the specified visibili | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %} -| `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Commits) matches commits to internal repositories. +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %}{% ifversion not fpt %} +| `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Commits) matches commits to internal repositories.{% endif %} | `is:private` | [**is:private**](https://github.com/search?q=is%3Aprivate&type=Commits) matches commits to private repositories. ## Further reading diff --git a/content/search-github/searching-on-github/searching-discussions.md b/content/search-github/searching-on-github/searching-discussions.md index 08da0e4d71..2e8b3728ee 100644 --- a/content/search-github/searching-on-github/searching-discussions.md +++ b/content/search-github/searching-on-github/searching-discussions.md @@ -43,8 +43,8 @@ You can filter by the visibility of the repository containing the discussions us | Qualifier | Example | :- | :- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %} -| `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Discussions) matches discussions in internal repositories. +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% ifversion not fpt %} +| `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Discussions) matches discussions in internal repositories.{% endif %} | `is:private` | [**is:private tiramisu**](https://github.com/search?q=is%3Aprivate+tiramisu&type=Discussions) matches discussions that contain the word "tiramisu" in private repositories you can access. ## Search by author diff --git a/content/search-github/searching-on-github/searching-for-repositories.md b/content/search-github/searching-on-github/searching-for-repositories.md index a6f39f23e0..9206ecf93f 100644 --- a/content/search-github/searching-on-github/searching-for-repositories.md +++ b/content/search-github/searching-on-github/searching-for-repositories.md @@ -149,8 +149,8 @@ You can filter your search based on the visibility of the repositories. For more | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public org:github**](https://github.com/search?q=is%3Apublic+org%3Agithub&type=Repositories) matches public repositories owned by {% data variables.product.company_short %}.{% endif %} -| `is:internal` | [**is:internal test**](https://github.com/search?q=is%3Ainternal+test&type=Repositories) matches internal repositories that you can access and contain the word "test". +| `is:public` | [**is:public org:github**](https://github.com/search?q=is%3Apublic+org%3Agithub&type=Repositories) matches public repositories owned by {% data variables.product.company_short %}.{% endif %}{% ifversion ghes or ghec %} +| `is:internal` | [**is:internal test**](https://github.com/search?q=is%3Ainternal+test&type=Repositories) matches internal repositories that you can access and contain the word "test".{% endif %} | `is:private` | [**is:private pages**](https://github.com/search?q=is%3Aprivate+pages&type=Repositories) matches private repositories that you can access and contain the word "pages." {% ifversion fpt or ghec %} diff --git a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md index 2e726d5f01..92ecd92bd4 100644 --- a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md +++ b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md @@ -80,7 +80,7 @@ You can filter by the visibility of the repository containing the issues and pul | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Issues) matches issues and pull requests in public repositories.{% endif %}{% ifversion fpt or ghes or ghae or ghec %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Issues) matches issues and pull requests in public repositories.{% endif %}{% ifversion ghes or ghae or ghec %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Issues) matches issues and pull requests in internal repositories.{% endif %} | `is:private` | [**is:private cupcake**](https://github.com/search?q=is%3Aprivate+cupcake&type=Issues) matches issues and pull requests that contain the word "cupcake" in private repositories you can access. From b24f9f4d89fd82be0a706bca27d09e0abe1cb882 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:46:58 +0100 Subject: [PATCH 08/33] more versioning for internal repos --- .../setting-repository-visibility.md | 12 +++--------- .../rest/guides/discovering-resources-for-a-user.md | 4 ++-- .../rest/guides/getting-started-with-the-rest-api.md | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md index d9b908a097..047f4733ac 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md @@ -45,23 +45,17 @@ We recommend reviewing the following caveats before you change the visibility of ### Making a repository private {% ifversion fpt or ghes or ghec %} -* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %} -* If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[What happens to forks when a repository is deleted or changes visibility?](/articles/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)"{% ifversion fpt %} +* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %}{% ifversion not fpt %} +* If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[What happens to forks when a repository is deleted or changes visibility?](/articles/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)"{% endif %}{% ifversion fpt %} * If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products) and "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}{% ifversion fpt or ghec %} * {% data variables.product.prodname_dotcom %} will no longer include the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." * {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working unless the repository is owned by an organization that is part of an enterprise with a license for {% data variables.product.prodname_advanced_security %} and sufficient spare seats. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion ghes %} * Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} -{% ifversion fpt or ghae or ghes or ghec %} +{% ifversion ghae or ghes or ghec %} ### Making a repository internal -{% note %} - -**Note:** {% data reusables.gated-features.internal-repos %} - -{% endnote %} - * Any forks of the repository will remain in the repository network, and {% data variables.product.product_name %} maintains the relationship between the root repository and the fork. For more information, see "[What happens to forks when a repository is deleted or changes visibility?](/articles/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)" {% endif %} diff --git a/content/rest/guides/discovering-resources-for-a-user.md b/content/rest/guides/discovering-resources-for-a-user.md index 6d3fbcd115..dd52889117 100644 --- a/content/rest/guides/discovering-resources-for-a-user.md +++ b/content/rest/guides/discovering-resources-for-a-user.md @@ -14,7 +14,7 @@ topics: shortTitle: Discover resources for a user --- - + When making authenticated requests to the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, applications often need to fetch the current user's repositories and organizations. In this guide, we'll explain how to reliably discover those resources. @@ -26,7 +26,7 @@ If you haven't already, you should read the ["Basics of Authentication"][basics- ## Discover the repositories that your app can access for a user -In addition to having their own personal repositories, a user may be a collaborator on repositories owned by other users and organizations. Collectively, these are the repositories where the user has privileged access: either it's a private repository where the user has read or write access, or it's a {% ifversion not ghae %}public{% else %}internal{% endif %} repository where the user has write access. +In addition to having their own personal repositories, a user may be a collaborator on repositories owned by other users and organizations. Collectively, these are the repositories where the user has privileged access: either it's a private repository where the user has read or write access, or it's a{% ifversion ghae %}n{% endif %} {% ifversion not ghae %}public{% endif %}{% ifversion ghec %} or {% endif %}{% ifversion ghae or ghec %}internal{% endif %} repository where the user has write access. [OAuth scopes][scopes] and [organization application policies][oap] determine which of those repositories your app can access for a user. Use the workflow below to discover those repositories. diff --git a/content/rest/guides/getting-started-with-the-rest-api.md b/content/rest/guides/getting-started-with-the-rest-api.md index de2aaec937..219b560e5a 100644 --- a/content/rest/guides/getting-started-with-the-rest-api.md +++ b/content/rest/guides/getting-started-with-the-rest-api.md @@ -65,7 +65,7 @@ Mmmmm, tastes like [JSON][json]. Let's add the `-i` flag to include headers: ```shell $ curl -i https://api.github.com/users/defunkt -> HTTP/2 200 +> HTTP/2 200 > server: GitHub.com > date: Thu, 08 Jul 2021 07:04:08 GMT > content-type: application/json; charset=utf-8 @@ -250,7 +250,7 @@ The information returned from these calls will depend on which scopes our token {% ifversion not ghae %} * A token with `public_repo` [scope][scopes] returns a response that includes all public repositories we have access to see on github.com.{% endif %} -* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. +* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghec or ghes or ghae %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. As the [docs][repos-api] indicate, these methods take a `type` parameter that can filter the repositories returned based on what type of access the user has From b3f4c16f4b22007580c73beb607e06f7dee35479 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Tue, 23 Nov 2021 14:46:58 +0100 Subject: [PATCH 09/33] more internal repo versioning --- .../connecting-with-third-party-applications.md | 2 +- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 8 ++++---- ...-when-a-repository-is-deleted-or-changes-visibility.md | 6 +----- .../deleted_forks_from_private_repositories_warning.md | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md index 74e09f9565..1bb2b44f0b 100644 --- a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md +++ b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md @@ -67,7 +67,7 @@ There are several types of data that applications can request. | Notifications | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. However, applications remain unable to access anything in your repositories. | | Organizations and teams | Organization and teams access allows apps to access and manage organization and team membership. | | Personal user data | User data includes information found in your user profile, like your name, e-mail address, and location. | -| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion not ghae %}public{% else %}internal{% endif %} or private repositories on a user-wide level. | +| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} or private repositories on a user-wide level. | | Repository delete | Applications can request to delete repositories that you administer, but they won't have access to your code. | ## Requesting updated permissions diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 440811b7ab..16cd919d6e 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -43,15 +43,15 @@ Name | Description **`(no scope)`** | Grants read-only access to public information (including user profile info, repository info, and gists){% endif %}{% ifversion ghes or ghae %} **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/rest/reference/enterprise-admin).{% endif %} **`repo`** | Grants full access to repositories, including private repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for repositories and organizations. Also grants ability to manage user projects. - `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% else %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. + `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code.  `repo_deployment`| Grants access to [deployment statuses](/rest/reference/repos#deployments) for {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code.{% ifversion not ghae %}  `public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.{% endif %}  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% ifversion fpt or ghes > 3.0 or ghec %}  `security_events` | Grants:
read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning)
read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning)
This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %}{% ifversion ghes < 3.1 %}  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %} -**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. - `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% else %}internal{% endif %} or private repositories. - `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% else %}internal{% endif %} or private repositories. +**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. + `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} or private repositories. + `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} or private repositories. **`admin:org`** | Fully manage the organization and its teams, projects, and memberships.  `write:org`| Read and write access to organization membership, organization projects, and team membership.  `read:org`| Read-only access to organization membership, organization projects, and team membership. diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index d71fb84226..b8bffde744 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -60,15 +60,11 @@ If a private repository is made public and then deleted, its private forks will {% endif %} -{% ifversion fpt or ghae or ghes or ghec %} +{% ifversion ghae or ghes or ghec %} ## Changing the visibility of an internal repository -{% note %} -**Note:** {% data reusables.gated-features.internal-repos %} - -{% endnote %} If the policy for your enterprise permits forking, any fork of an internal repository will be private. If you change the visibility of an internal repository, any fork owned by an organization or user account will remain private. diff --git a/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index 290affbc48..43fe7d3734 100644 --- a/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -6,6 +6,6 @@ - When [LDAP Sync is enabled](/enterprise/admin/authentication/using-ldap#enabling-ldap-sync), if you remove a person from a repository, they will lose access but their forks will not be deleted. If the person is added to a team with access to the original organization repository within three months, their access to the forks will be automatically restored on the next sync.{% endif %} - You are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property. -- People with admin permissions to a private{% ifversion fpt or ghes or ghae or ghec %} or internal{% endif %} repository can disallow forking of that repository, and organization owners can disallow forking of any private{% ifversion fpt or ghes or ghae or ghec %} or internal{% endif %} repository in an organization. For more information, see "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)" and "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." +- People with admin permissions to a private{% ifversion ghes or ghae or ghec %} or internal{% endif %} repository can disallow forking of that repository, and organization owners can disallow forking of any private{% ifversion ghes or ghae or ghec %} or internal{% endif %} repository in an organization. For more information, see "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)" and "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." {% endwarning %} From 68b1bfb11edc5fe766121d87fe00e6927d377494 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 24 Nov 2021 08:22:56 +0100 Subject: [PATCH 10/33] creates internal repo version and adds to articles --- .../connecting-with-third-party-applications.md | 2 +- .../security-overview/about-the-security-overview.md | 2 +- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 8 ++++---- .../managing-the-forking-policy-for-your-organization.md | 6 +++--- ...estricting-repository-creation-in-your-organization.md | 2 +- ...-when-a-repository-is-deleted-or-changes-visibility.md | 2 +- .../about-repositories.md | 2 +- .../deleting-a-repository.md | 2 +- .../classifying-your-repository-with-topics.md | 2 +- .../setting-repository-visibility.md | 4 ++-- content/rest/guides/getting-started-with-the-rest-api.md | 2 +- .../searching-on-github/searching-commits.md | 2 +- .../searching-on-github/searching-discussions.md | 2 +- .../searching-on-github/searching-for-repositories.md | 2 +- .../searching-issues-and-pull-requests.md | 2 +- data/features/internal-repositories.yml | 5 +++++ .../github-actions/private-repository-forks-overview.md | 2 +- 17 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 data/features/internal-repositories.yml diff --git a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md index 1bb2b44f0b..8750d051dd 100644 --- a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md +++ b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md @@ -67,7 +67,7 @@ There are several types of data that applications can request. | Notifications | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. However, applications remain unable to access anything in your repositories. | | Organizations and teams | Organization and teams access allows apps to access and manage organization and team membership. | | Personal user data | User data includes information found in your user profile, like your name, e-mail address, and location. | -| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} or private repositories on a user-wide level. | +| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion fpt or ghes or ghec %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} or private repositories on a user-wide level. | | Repository delete | Applications can request to delete repositories that you administer, but they won't have access to your code. | ## Requesting updated permissions diff --git a/content/code-security/security-overview/about-the-security-overview.md b/content/code-security/security-overview/about-the-security-overview.md index c7a00cdf47..0a00e0f9f5 100644 --- a/content/code-security/security-overview/about-the-security-overview.md +++ b/content/code-security/security-overview/about-the-security-overview.md @@ -106,7 +106,7 @@ The level of risk for a repository is determined by the number and severity of a | Qualifier | Description | | -------- | -------- |{% ifversion fpt or ghes > 3.1 or ghec %} -| `is:public` | Display public repositories. |{% endif %}{% ifversion not fpt %} +| `is:public` | Display public repositories. |{% endif %}{% ifversion internal-repositories %} | `is:internal` | Display internal repositories. |{% endif %} | `is:private` | Display private repositories. | | `archived:true` | Display archived repositories. | diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 16cd919d6e..104e50e5df 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -43,15 +43,15 @@ Name | Description **`(no scope)`** | Grants read-only access to public information (including user profile info, repository info, and gists){% endif %}{% ifversion ghes or ghae %} **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/rest/reference/enterprise-admin).{% endif %} **`repo`** | Grants full access to repositories, including private repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for repositories and organizations. Also grants ability to manage user projects. - `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. + `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code.  `repo_deployment`| Grants access to [deployment statuses](/rest/reference/repos#deployments) for {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code.{% ifversion not ghae %}  `public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.{% endif %}  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% ifversion fpt or ghes > 3.0 or ghec %}  `security_events` | Grants:
read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning)
read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning)
This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %}{% ifversion ghes < 3.1 %}  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %} -**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. - `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} or private repositories. - `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion not fpt %}internal{% endif %} or private repositories. +**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. + `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} or private repositories. + `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} or private repositories. **`admin:org`** | Fully manage the organization and its teams, projects, and memberships.  `write:org`| Read and write access to organization membership, organization projects, and team membership.  `read:org`| Read-only access to organization membership, organization projects, and team membership. diff --git a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md index e079a0cb3e..daf26ce1e1 100644 --- a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md @@ -17,13 +17,13 @@ topics: shortTitle: Manage forking policy --- -By default, new organizations are configured to disallow the forking of private{% ifversion ghes or ghae or ghec %} and internal{% endif %} repositories. +By default, new organizations are configured to disallow the forking of private{% ifversion internal-repositories %} and internal{% endif %} repositories. -If you allow forking of private{% ifversion ghes or ghae or ghec %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% ifversion ghes or ghae or ghec %} or internal{% endif %} repository. For more information, see "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." +If you allow forking of private{% ifversion internal-repositories %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% ifversion internal-repositories %} or internal{% endif %} repository. For more information, see "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.member-privileges %}{% ifversion ghes or ghae or ghec %} +{% data reusables.organizations.member-privileges %}{% ifversion internal-repositories %} 5. Under "Repository forking", select **Allow forking of private and internal repositories**. ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-organization.png){% endif %}{% ifversion fpt %} 5. Under "Repository forking", select **Allow forking of private repositories**. diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index 94178a7494..47a8392c57 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -30,7 +30,7 @@ Organization owners can always create any type of repository. {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository creation", select one or more options.{% ifversion not fpt %} +5. Under "Repository creation", select one or more options.{% ifversion internal-repositories %} ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png){% endif %}{% ifversion fpt %} ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png){% endif %} 6. Click **Save**. diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index b8bffde744..a9ecf2a3b0 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -60,7 +60,7 @@ If a private repository is made public and then deleted, its private forks will {% endif %} -{% ifversion ghae or ghes or ghec %} +{% ifversion internal-repositories %} ## Changing the visibility of an internal repository diff --git a/content/repositories/creating-and-managing-repositories/about-repositories.md b/content/repositories/creating-and-managing-repositories/about-repositories.md index 15696c0f97..5f0c6aad5e 100644 --- a/content/repositories/creating-and-managing-repositories/about-repositories.md +++ b/content/repositories/creating-and-managing-repositories/about-repositories.md @@ -61,7 +61,7 @@ Organization owners always have access to every repository created in an organiz People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." -{% ifversion ghae or ghes or ghec %} +{% ifversion internal-repositories %} ## About internal repositories {% note %} diff --git a/content/repositories/creating-and-managing-repositories/deleting-a-repository.md b/content/repositories/creating-and-managing-repositories/deleting-a-repository.md index 20ffb8519f..7a2bc100dc 100644 --- a/content/repositories/creating-and-managing-repositories/deleting-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/deleting-a-repository.md @@ -24,7 +24,7 @@ topics: **Warnings**: - Deleting a repository will **permanently** delete release attachments and team permissions. This action **cannot** be undone. -- Deleting a private{% ifversion not fpt %} or internal{% endif %} repository will delete all forks of the repository. +- Deleting a private{% ifversion internal-repositories %} or internal{% endif %} repository will delete all forks of the repository. {% endwarning %} diff --git a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md index 2a72b8bbe0..c8d79eb042 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md @@ -27,7 +27,7 @@ To browse the most used topics, go to https://github.com/topics/. Repository admins can add any topics they'd like to a repository. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% ifversion fpt or ghec %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Private repository content is not analyzed and does not receive topic suggestions.{% endif %} -{% ifversion ghae %}Internal {% else %}Public{% ifversion not fpt %}, internal,{% endif %}{% endif %} and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. +{% ifversion ghae %}Internal {% else %}Public{% ifversion internal-repositories %}, internal,{% endif %}{% endif %} and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. You can search for repositories that are associated with a particular topic. For more information, see "[Searching for repositories](/search-github/searching-on-github/searching-for-repositories#search-by-topic)." You can also search for a list of topics on {% data variables.product.product_name %}. For more information, see "[Searching topics](/search-github/searching-on-github/searching-topics)." diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md index 047f4733ac..a0aef96e5d 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md @@ -45,14 +45,14 @@ We recommend reviewing the following caveats before you change the visibility of ### Making a repository private {% ifversion fpt or ghes or ghec %} -* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %}{% ifversion not fpt %} +* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %}{% ifversion internal-repositories %} * If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[What happens to forks when a repository is deleted or changes visibility?](/articles/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)"{% endif %}{% ifversion fpt %} * If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products) and "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}{% ifversion fpt or ghec %} * {% data variables.product.prodname_dotcom %} will no longer include the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." * {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working unless the repository is owned by an organization that is part of an enterprise with a license for {% data variables.product.prodname_advanced_security %} and sufficient spare seats. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion ghes %} * Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} -{% ifversion ghae or ghes or ghec %} +{% ifversion internal-repositories %} ### Making a repository internal diff --git a/content/rest/guides/getting-started-with-the-rest-api.md b/content/rest/guides/getting-started-with-the-rest-api.md index 219b560e5a..1dc9cd83af 100644 --- a/content/rest/guides/getting-started-with-the-rest-api.md +++ b/content/rest/guides/getting-started-with-the-rest-api.md @@ -250,7 +250,7 @@ The information returned from these calls will depend on which scopes our token {% ifversion not ghae %} * A token with `public_repo` [scope][scopes] returns a response that includes all public repositories we have access to see on github.com.{% endif %} -* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghec or ghes or ghae %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. +* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. As the [docs][repos-api] indicate, these methods take a `type` parameter that can filter the repositories returned based on what type of access the user has diff --git a/content/search-github/searching-on-github/searching-commits.md b/content/search-github/searching-on-github/searching-commits.md index 2652e64d48..307b1093e0 100644 --- a/content/search-github/searching-on-github/searching-commits.md +++ b/content/search-github/searching-on-github/searching-commits.md @@ -106,7 +106,7 @@ The `is` qualifier matches commits from repositories with the specified visibili | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %}{% ifversion not fpt %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %}{% ifversion internal-repositories %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Commits) matches commits to internal repositories.{% endif %} | `is:private` | [**is:private**](https://github.com/search?q=is%3Aprivate&type=Commits) matches commits to private repositories. diff --git a/content/search-github/searching-on-github/searching-discussions.md b/content/search-github/searching-on-github/searching-discussions.md index 2e8b3728ee..5c14a1d7c0 100644 --- a/content/search-github/searching-on-github/searching-discussions.md +++ b/content/search-github/searching-on-github/searching-discussions.md @@ -43,7 +43,7 @@ You can filter by the visibility of the repository containing the discussions us | Qualifier | Example | :- | :- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% ifversion not fpt %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% ifversion internal-repositories %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Discussions) matches discussions in internal repositories.{% endif %} | `is:private` | [**is:private tiramisu**](https://github.com/search?q=is%3Aprivate+tiramisu&type=Discussions) matches discussions that contain the word "tiramisu" in private repositories you can access. diff --git a/content/search-github/searching-on-github/searching-for-repositories.md b/content/search-github/searching-on-github/searching-for-repositories.md index 9206ecf93f..8a656838b8 100644 --- a/content/search-github/searching-on-github/searching-for-repositories.md +++ b/content/search-github/searching-on-github/searching-for-repositories.md @@ -149,7 +149,7 @@ You can filter your search based on the visibility of the repositories. For more | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public org:github**](https://github.com/search?q=is%3Apublic+org%3Agithub&type=Repositories) matches public repositories owned by {% data variables.product.company_short %}.{% endif %}{% ifversion ghes or ghec %} +| `is:public` | [**is:public org:github**](https://github.com/search?q=is%3Apublic+org%3Agithub&type=Repositories) matches public repositories owned by {% data variables.product.company_short %}.{% endif %}{% ifversion internal-repositories %} | `is:internal` | [**is:internal test**](https://github.com/search?q=is%3Ainternal+test&type=Repositories) matches internal repositories that you can access and contain the word "test".{% endif %} | `is:private` | [**is:private pages**](https://github.com/search?q=is%3Aprivate+pages&type=Repositories) matches private repositories that you can access and contain the word "pages." diff --git a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md index 92ecd92bd4..6e67536066 100644 --- a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md +++ b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md @@ -80,7 +80,7 @@ You can filter by the visibility of the repository containing the issues and pul | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Issues) matches issues and pull requests in public repositories.{% endif %}{% ifversion ghes or ghae or ghec %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Issues) matches issues and pull requests in public repositories.{% endif %}{% ifversion internal-repositories %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Issues) matches issues and pull requests in internal repositories.{% endif %} | `is:private` | [**is:private cupcake**](https://github.com/search?q=is%3Aprivate+cupcake&type=Issues) matches issues and pull requests that contain the word "cupcake" in private repositories you can access. diff --git a/data/features/internal-repositories.yml b/data/features/internal-repositories.yml new file mode 100644 index 0000000000..6dd81c9205 --- /dev/null +++ b/data/features/internal-repositories.yml @@ -0,0 +1,5 @@ +# Documentation for internal repositories. +versions: + ghec: '*' + ghae: '*' + ghes: '>=3.0' diff --git a/data/reusables/github-actions/private-repository-forks-overview.md b/data/reusables/github-actions/private-repository-forks-overview.md index afd4a76225..17783a05d0 100644 --- a/data/reusables/github-actions/private-repository-forks-overview.md +++ b/data/reusables/github-actions/private-repository-forks-overview.md @@ -1,4 +1,4 @@ -If you rely on using forks of your private repositories, you can configure policies that control how users can run workflows on `pull_request` events. Available to private {% ifversion not fpt %}and internal{% endif %} repositories only, you can configure these policy settings for {% ifversion not fpt %}enterprises, {% endif %}organizations, or repositories.{% ifversion not fpt %} For enterprises, the policies are applied to all repositories in all organizations.{% endif %} +If you rely on using forks of your private repositories, you can configure policies that control how users can run workflows on `pull_request` events. Available to private {% ifversion internal-repositories %}and internal{% endif %} repositories only, you can configure these policy settings for {% ifversion ghec or ghes or ghae %}enterprises, {% endif %}organizations, or repositories.{% ifversion ghec or ghes or ghae %} For enterprises, the policies are applied to all repositories in all organizations.{% endif %} - **Run workflows from fork pull requests** - Allows users to run workflows from fork pull requests, using a `GITHUB_TOKEN` with read-only permission, and with no access to secrets. - **Send write tokens to workflows from pull requests** - Allows pull requests from forks to use a `GITHUB_TOKEN` with write permission. From 42a1190b96e1b831902e7c59428f60e61e1674f7 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 24 Nov 2021 09:15:53 +0100 Subject: [PATCH 11/33] minor rewording --- ...estricting-repository-creation-in-your-organization.md | 4 ++-- .../about-repositories.md | 8 +------- .../setting-repository-visibility.md | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index 47a8392c57..04a89ddd76 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -15,11 +15,11 @@ topics: shortTitle: Restrict repository creation --- -You can choose whether members can create repositories in your organization. If you allow members to create repositories, you can choose which types of repositories members can create.{% ifversion fpt or ghec %} To allow members to create private repositories only, your organization must use {% data variables.product.prodname_ghe_cloud %}.{% endif %} For more information, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility)." +You can choose whether members can create repositories in your organization. If you allow members to create repositories, you can choose which types of repositories members can create.{% ifversion fpt or ghec %} To allow members to create private repositories only, your organization must use {% data variables.product.prodname_ghe_cloud %}.{% endif %} For more information, see "[About repositories](/enterprise-cloud@latest/repositories/creating-and-managing-repositories/about-repositories)" in the {% data variables.product.prodname_ghe_cloud %} documentation. Organization owners can always create any type of repository. -{% ifversion fpt or ghec %}Enterprise owners{% else %}Site administrators{% endif %} can restrict the options you have available for your organization's repository creation policy. For more information, see "[Restricting repository creation in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#setting-a-policy-for-repository-creation)." +{% ifversion fpt or ghec %}Enterprise owners{% else %}Site administrators{% endif %} can restrict the options you have available for your organization's repository creation policy. For more information, see{% ifversion fpt %} "[Restricting repository creation in your enterprise](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise)."{% endif %}{% ifversion ghec or ghes or ghae %} "[Restricting repository creation in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#setting-a-policy-for-repository-creation)."{% endif %} {% warning %} diff --git a/content/repositories/creating-and-managing-repositories/about-repositories.md b/content/repositories/creating-and-managing-repositories/about-repositories.md index 5f0c6aad5e..8967216be9 100644 --- a/content/repositories/creating-and-managing-repositories/about-repositories.md +++ b/content/repositories/creating-and-managing-repositories/about-repositories.md @@ -44,7 +44,7 @@ You can use repositories to manage your work and collaborate with others. ## About repository visibility -You can restrict who has access to a repository by choosing a repository's visibility: {% ifversion fpt or ghes or ghec %}public, internal, or private{% elsif ghae %}private or internal{% else %} public or private{% endif %}. +You can restrict who has access to a repository by choosing a repository's visibility: {% ifversion ghes or ghec %}public, internal, or private{% elsif ghae %}private or internal{% else %} public or private{% endif %}. {% ifversion ghae %}When you create a repository owned by your user account, the repository is always private. When you create a repository owned by an organization, you can choose to make the repository private or internal.{% else %}When you create a repository, you can choose to make the repository public or private.{% ifversion ghes or ghec %} If you're creating the repository in an organization{% ifversion ghec %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %}{% endif %}{% ifversion fpt %} Repositories in organizations that use {% data variables.product.prodname_ghe_cloud %} can also be created with internal visibility. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)" in the {% data variables.product.prodname_ghe_cloud %} documentation. {% endif %} @@ -64,12 +64,6 @@ People with admin permissions for a repository can change an existing repository {% ifversion internal-repositories %} ## About internal repositories -{% note %} - -**Note:** {% data reusables.gated-features.internal-repos %} - -{% endnote %} - {% data reusables.repositories.about-internal-repos %} For more information on innersource, see {% data variables.product.prodname_dotcom %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." All enterprise members have read permissions to the internal repository, but internal repositories are not visible to people {% ifversion fpt or ghec %}outside of the enterprise{% else %}who are not members of any organization{% endif %}, including outside collaborators on organization repositories. For more information, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise#enterprise-members)" and "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)." diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md index a0aef96e5d..950127b466 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md @@ -23,7 +23,7 @@ Organization owners can restrict the ability to change repository visibility to {% ifversion fpt or ghec %} -If you're a member of an {% data variables.product.prodname_emu_enterprise %}, your repositories owned by your user account can only be private, and repositories in your enterprise's organizations can only be private or internal. +Members of an {% data variables.product.prodname_emu_enterprise %} can only set the visibility of repositories owned by their user account to private, and repositories in their enterprise's organizations can only be private or internal.{% ifversion fpt %} For more information, see "[About Enterprise Managed Users](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %} {% endif %} From 1a9dfbb4a6cb278710894a25d4802c7fbfdeb0fa Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 24 Nov 2021 12:08:39 +0100 Subject: [PATCH 12/33] simplify versioning in about wikis --- .../documenting-your-project-with-wikis/about-wikis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/communities/documenting-your-project-with-wikis/about-wikis.md b/content/communities/documenting-your-project-with-wikis/about-wikis.md index 7a3f22a721..9d6ac99ff3 100644 --- a/content/communities/documenting-your-project-with-wikis/about-wikis.md +++ b/content/communities/documenting-your-project-with-wikis/about-wikis.md @@ -19,7 +19,7 @@ Every repository on {% ifversion ghae %}{% data variables.product.product_name % With wikis, you can write content just like everywhere else on {% data variables.product.product_name %}. For more information, see "[Getting started with writing and formatting on {% data variables.product.prodname_dotcom %}](/articles/getting-started-with-writing-and-formatting-on-github)." We use [our open-source Markup library](https://github.com/github/markup) to convert different formats into HTML, so you can choose to write in Markdown or any other supported format. -{% ifversion fpt or ghes or ghec %}If you create a wiki in a public repository, the wiki is available to {% ifversion ghes %}anyone with access to {% data variables.product.product_location %}{% else %}the public{% endif %}. {% endif %}If you create a wiki in a{% ifversion ghec %}n internal or{% endif %} private repository, only {% ifversion fpt or ghes or ghec %}people{% elsif ghae %}enterprise members{% endif %} with access to the repository can access the wiki. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)." +{% ifversion fpt or ghes or ghec %}If you create a wiki in a public repository, the wiki is available to {% ifversion ghes %}anyone with access to {% data variables.product.product_location %}{% else %}the public{% endif %}. {% endif %}If you create a wiki in a private{% ifversion ghec or ghes %} or internal{% endif %} repository, only {% ifversion fpt or ghes or ghec %}people{% elsif ghae %}enterprise members{% endif %} with access to the repository can access the wiki. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)." You can edit wikis directly on {% data variables.product.product_name %}, or you can edit wiki files locally. By default, only people with write access to your repository can make changes to wikis, although you can allow everyone on {% data variables.product.product_location %} to contribute to a wiki in {% ifversion ghae %}an internal{% else %}a public{% endif %} repository. For more information, see "[Changing access permissions for wikis](/communities/documenting-your-project-with-wikis/changing-access-permissions-for-wikis)". From 1de338c41bddb9aa7bce2a99109bf3195002f176 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 24 Nov 2021 15:21:40 +0100 Subject: [PATCH 13/33] fix feature versioning syntax --- .../connecting-with-third-party-applications.md | 2 +- .../security-overview/about-the-security-overview.md | 2 +- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 8 ++++---- .../managing-the-forking-policy-for-your-organization.md | 6 +++--- ...estricting-repository-creation-in-your-organization.md | 2 +- ...-when-a-repository-is-deleted-or-changes-visibility.md | 2 +- .../about-repositories.md | 2 +- .../deleting-a-repository.md | 2 +- .../classifying-your-repository-with-topics.md | 2 +- .../setting-repository-visibility.md | 4 ++-- content/rest/guides/getting-started-with-the-rest-api.md | 2 +- .../searching-on-github/searching-commits.md | 2 +- .../searching-on-github/searching-discussions.md | 2 +- .../searching-on-github/searching-for-repositories.md | 2 +- .../searching-issues-and-pull-requests.md | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md index 8750d051dd..ded5da40a6 100644 --- a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md +++ b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md @@ -67,7 +67,7 @@ There are several types of data that applications can request. | Notifications | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. However, applications remain unable to access anything in your repositories. | | Organizations and teams | Organization and teams access allows apps to access and manage organization and team membership. | | Personal user data | User data includes information found in your user profile, like your name, e-mail address, and location. | -| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion fpt or ghes or ghec %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} or private repositories on a user-wide level. | +| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion fpt or ghes or ghec %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} or private repositories on a user-wide level. | | Repository delete | Applications can request to delete repositories that you administer, but they won't have access to your code. | ## Requesting updated permissions diff --git a/content/code-security/security-overview/about-the-security-overview.md b/content/code-security/security-overview/about-the-security-overview.md index 0a00e0f9f5..a6e53d91a0 100644 --- a/content/code-security/security-overview/about-the-security-overview.md +++ b/content/code-security/security-overview/about-the-security-overview.md @@ -106,7 +106,7 @@ The level of risk for a repository is determined by the number and severity of a | Qualifier | Description | | -------- | -------- |{% ifversion fpt or ghes > 3.1 or ghec %} -| `is:public` | Display public repositories. |{% endif %}{% ifversion internal-repositories %} +| `is:public` | Display public repositories. |{% endif %}{% if internal-repositories %} | `is:internal` | Display internal repositories. |{% endif %} | `is:private` | Display private repositories. | | `archived:true` | Display archived repositories. | diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 104e50e5df..2843f9cf9e 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -43,15 +43,15 @@ Name | Description **`(no scope)`** | Grants read-only access to public information (including user profile info, repository info, and gists){% endif %}{% ifversion ghes or ghae %} **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/rest/reference/enterprise-admin).{% endif %} **`repo`** | Grants full access to repositories, including private repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for repositories and organizations. Also grants ability to manage user projects. - `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. + `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code.  `repo_deployment`| Grants access to [deployment statuses](/rest/reference/repos#deployments) for {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code.{% ifversion not ghae %}  `public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.{% endif %}  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% ifversion fpt or ghes > 3.0 or ghec %}  `security_events` | Grants:
read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning)
read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning)
This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %}{% ifversion ghes < 3.1 %}  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %} -**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. - `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} or private repositories. - `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} or private repositories. +**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. + `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} or private repositories. + `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} or private repositories. **`admin:org`** | Fully manage the organization and its teams, projects, and memberships.  `write:org`| Read and write access to organization membership, organization projects, and team membership.  `read:org`| Read-only access to organization membership, organization projects, and team membership. diff --git a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md index daf26ce1e1..b217393f00 100644 --- a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md @@ -17,13 +17,13 @@ topics: shortTitle: Manage forking policy --- -By default, new organizations are configured to disallow the forking of private{% ifversion internal-repositories %} and internal{% endif %} repositories. +By default, new organizations are configured to disallow the forking of private{% if internal-repositories %} and internal{% endif %} repositories. -If you allow forking of private{% ifversion internal-repositories %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% ifversion internal-repositories %} or internal{% endif %} repository. For more information, see "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." +If you allow forking of private{% if internal-repositories %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% if internal-repositories %} or internal{% endif %} repository. For more information, see "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.member-privileges %}{% ifversion internal-repositories %} +{% data reusables.organizations.member-privileges %}{% if internal-repositories %} 5. Under "Repository forking", select **Allow forking of private and internal repositories**. ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-organization.png){% endif %}{% ifversion fpt %} 5. Under "Repository forking", select **Allow forking of private repositories**. diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index 04a89ddd76..a3fb556838 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -30,7 +30,7 @@ Organization owners can always create any type of repository. {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository creation", select one or more options.{% ifversion internal-repositories %} +5. Under "Repository creation", select one or more options.{% if internal-repositories %} ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png){% endif %}{% ifversion fpt %} ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png){% endif %} 6. Click **Save**. diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index a9ecf2a3b0..29daf34d18 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -60,7 +60,7 @@ If a private repository is made public and then deleted, its private forks will {% endif %} -{% ifversion internal-repositories %} +{% if internal-repositories %} ## Changing the visibility of an internal repository diff --git a/content/repositories/creating-and-managing-repositories/about-repositories.md b/content/repositories/creating-and-managing-repositories/about-repositories.md index 8967216be9..7f796e3780 100644 --- a/content/repositories/creating-and-managing-repositories/about-repositories.md +++ b/content/repositories/creating-and-managing-repositories/about-repositories.md @@ -61,7 +61,7 @@ Organization owners always have access to every repository created in an organiz People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." -{% ifversion internal-repositories %} +{% if internal-repositories %} ## About internal repositories {% data reusables.repositories.about-internal-repos %} For more information on innersource, see {% data variables.product.prodname_dotcom %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." diff --git a/content/repositories/creating-and-managing-repositories/deleting-a-repository.md b/content/repositories/creating-and-managing-repositories/deleting-a-repository.md index 7a2bc100dc..b671b0a7fc 100644 --- a/content/repositories/creating-and-managing-repositories/deleting-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/deleting-a-repository.md @@ -24,7 +24,7 @@ topics: **Warnings**: - Deleting a repository will **permanently** delete release attachments and team permissions. This action **cannot** be undone. -- Deleting a private{% ifversion internal-repositories %} or internal{% endif %} repository will delete all forks of the repository. +- Deleting a private{% if internal-repositories %} or internal{% endif %} repository will delete all forks of the repository. {% endwarning %} diff --git a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md index c8d79eb042..6bd86618c9 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md @@ -27,7 +27,7 @@ To browse the most used topics, go to https://github.com/topics/. Repository admins can add any topics they'd like to a repository. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% ifversion fpt or ghec %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Private repository content is not analyzed and does not receive topic suggestions.{% endif %} -{% ifversion ghae %}Internal {% else %}Public{% ifversion internal-repositories %}, internal,{% endif %}{% endif %} and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. +{% ifversion ghae %}Internal {% else %}Public{% if internal-repositories %}, internal,{% endif %}{% endif %} and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. You can search for repositories that are associated with a particular topic. For more information, see "[Searching for repositories](/search-github/searching-on-github/searching-for-repositories#search-by-topic)." You can also search for a list of topics on {% data variables.product.product_name %}. For more information, see "[Searching topics](/search-github/searching-on-github/searching-topics)." diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md index 950127b466..8479579257 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md @@ -45,14 +45,14 @@ We recommend reviewing the following caveats before you change the visibility of ### Making a repository private {% ifversion fpt or ghes or ghec %} -* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %}{% ifversion internal-repositories %} +* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %}{% if internal-repositories %} * If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[What happens to forks when a repository is deleted or changes visibility?](/articles/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)"{% endif %}{% ifversion fpt %} * If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products) and "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}{% ifversion fpt or ghec %} * {% data variables.product.prodname_dotcom %} will no longer include the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." * {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working unless the repository is owned by an organization that is part of an enterprise with a license for {% data variables.product.prodname_advanced_security %} and sufficient spare seats. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion ghes %} * Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} -{% ifversion internal-repositories %} +{% if internal-repositories %} ### Making a repository internal diff --git a/content/rest/guides/getting-started-with-the-rest-api.md b/content/rest/guides/getting-started-with-the-rest-api.md index 1dc9cd83af..38665d8318 100644 --- a/content/rest/guides/getting-started-with-the-rest-api.md +++ b/content/rest/guides/getting-started-with-the-rest-api.md @@ -250,7 +250,7 @@ The information returned from these calls will depend on which scopes our token {% ifversion not ghae %} * A token with `public_repo` [scope][scopes] returns a response that includes all public repositories we have access to see on github.com.{% endif %} -* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion internal-repositories %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. +* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. As the [docs][repos-api] indicate, these methods take a `type` parameter that can filter the repositories returned based on what type of access the user has diff --git a/content/search-github/searching-on-github/searching-commits.md b/content/search-github/searching-on-github/searching-commits.md index 307b1093e0..33e8271043 100644 --- a/content/search-github/searching-on-github/searching-commits.md +++ b/content/search-github/searching-on-github/searching-commits.md @@ -106,7 +106,7 @@ The `is` qualifier matches commits from repositories with the specified visibili | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %}{% ifversion internal-repositories %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %}{% if internal-repositories %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Commits) matches commits to internal repositories.{% endif %} | `is:private` | [**is:private**](https://github.com/search?q=is%3Aprivate&type=Commits) matches commits to private repositories. diff --git a/content/search-github/searching-on-github/searching-discussions.md b/content/search-github/searching-on-github/searching-discussions.md index 5c14a1d7c0..2e7993437c 100644 --- a/content/search-github/searching-on-github/searching-discussions.md +++ b/content/search-github/searching-on-github/searching-discussions.md @@ -43,7 +43,7 @@ You can filter by the visibility of the repository containing the discussions us | Qualifier | Example | :- | :- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% ifversion internal-repositories %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% if internal-repositories %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Discussions) matches discussions in internal repositories.{% endif %} | `is:private` | [**is:private tiramisu**](https://github.com/search?q=is%3Aprivate+tiramisu&type=Discussions) matches discussions that contain the word "tiramisu" in private repositories you can access. diff --git a/content/search-github/searching-on-github/searching-for-repositories.md b/content/search-github/searching-on-github/searching-for-repositories.md index 8a656838b8..c35ff753f0 100644 --- a/content/search-github/searching-on-github/searching-for-repositories.md +++ b/content/search-github/searching-on-github/searching-for-repositories.md @@ -149,7 +149,7 @@ You can filter your search based on the visibility of the repositories. For more | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public org:github**](https://github.com/search?q=is%3Apublic+org%3Agithub&type=Repositories) matches public repositories owned by {% data variables.product.company_short %}.{% endif %}{% ifversion internal-repositories %} +| `is:public` | [**is:public org:github**](https://github.com/search?q=is%3Apublic+org%3Agithub&type=Repositories) matches public repositories owned by {% data variables.product.company_short %}.{% endif %}{% if internal-repositories %} | `is:internal` | [**is:internal test**](https://github.com/search?q=is%3Ainternal+test&type=Repositories) matches internal repositories that you can access and contain the word "test".{% endif %} | `is:private` | [**is:private pages**](https://github.com/search?q=is%3Aprivate+pages&type=Repositories) matches private repositories that you can access and contain the word "pages." diff --git a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md index 6e67536066..83ba0d0a97 100644 --- a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md +++ b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md @@ -80,7 +80,7 @@ You can filter by the visibility of the repository containing the issues and pul | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Issues) matches issues and pull requests in public repositories.{% endif %}{% ifversion internal-repositories %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Issues) matches issues and pull requests in public repositories.{% endif %}{% if internal-repositories %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Issues) matches issues and pull requests in internal repositories.{% endif %} | `is:private` | [**is:private cupcake**](https://github.com/search?q=is%3Aprivate+cupcake&type=Issues) matches issues and pull requests that contain the word "cupcake" in private repositories you can access. From 310595fe85bbd9474d5f82a3657b85137e13844a Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 24 Nov 2021 15:31:11 +0100 Subject: [PATCH 14/33] fix versioning syntax --- .../github-actions/private-repository-forks-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/github-actions/private-repository-forks-overview.md b/data/reusables/github-actions/private-repository-forks-overview.md index 17783a05d0..3655507623 100644 --- a/data/reusables/github-actions/private-repository-forks-overview.md +++ b/data/reusables/github-actions/private-repository-forks-overview.md @@ -1,4 +1,4 @@ -If you rely on using forks of your private repositories, you can configure policies that control how users can run workflows on `pull_request` events. Available to private {% ifversion internal-repositories %}and internal{% endif %} repositories only, you can configure these policy settings for {% ifversion ghec or ghes or ghae %}enterprises, {% endif %}organizations, or repositories.{% ifversion ghec or ghes or ghae %} For enterprises, the policies are applied to all repositories in all organizations.{% endif %} +If you rely on using forks of your private repositories, you can configure policies that control how users can run workflows on `pull_request` events. Available to private {% if internal-repositories %}and internal{% endif %} repositories only, you can configure these policy settings for {% ifversion ghec or ghes or ghae %}enterprises, {% endif %}organizations, or repositories.{% ifversion ghec or ghes or ghae %} For enterprises, the policies are applied to all repositories in all organizations.{% endif %} - **Run workflows from fork pull requests** - Allows users to run workflows from fork pull requests, using a `GITHUB_TOKEN` with read-only permission, and with no access to secrets. - **Send write tokens to workflows from pull requests** - Allows pull requests from forks to use a `GITHUB_TOKEN` with write permission. From 1b65a1fb07e2eadd27cfd2207f553b8c1f01f9f2 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Thu, 25 Nov 2021 11:46:27 +0100 Subject: [PATCH 15/33] version based versioning --- .../connecting-with-third-party-applications.md | 2 +- .../security-overview/about-the-security-overview.md | 2 +- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 8 ++++---- .../managing-the-forking-policy-for-your-organization.md | 6 +++--- ...estricting-repository-creation-in-your-organization.md | 2 +- ...-when-a-repository-is-deleted-or-changes-visibility.md | 2 +- .../about-repositories.md | 2 +- .../deleting-a-repository.md | 2 +- .../classifying-your-repository-with-topics.md | 2 +- .../setting-repository-visibility.md | 4 ++-- content/rest/guides/getting-started-with-the-rest-api.md | 2 +- .../searching-on-github/searching-commits.md | 2 +- .../searching-on-github/searching-discussions.md | 2 +- .../searching-on-github/searching-for-repositories.md | 2 +- .../searching-issues-and-pull-requests.md | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md index ded5da40a6..33ec1434e2 100644 --- a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md +++ b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md @@ -67,7 +67,7 @@ There are several types of data that applications can request. | Notifications | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. However, applications remain unable to access anything in your repositories. | | Organizations and teams | Organization and teams access allows apps to access and manage organization and team membership. | | Personal user data | User data includes information found in your user profile, like your name, e-mail address, and location. | -| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion fpt or ghes or ghec %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} or private repositories on a user-wide level. | +| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion fpt or ghes or ghec %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories on a user-wide level. | | Repository delete | Applications can request to delete repositories that you administer, but they won't have access to your code. | ## Requesting updated permissions diff --git a/content/code-security/security-overview/about-the-security-overview.md b/content/code-security/security-overview/about-the-security-overview.md index a6e53d91a0..dec7077829 100644 --- a/content/code-security/security-overview/about-the-security-overview.md +++ b/content/code-security/security-overview/about-the-security-overview.md @@ -106,7 +106,7 @@ The level of risk for a repository is determined by the number and severity of a | Qualifier | Description | | -------- | -------- |{% ifversion fpt or ghes > 3.1 or ghec %} -| `is:public` | Display public repositories. |{% endif %}{% if internal-repositories %} +| `is:public` | Display public repositories. |{% endif %}{% ifversion ghes or ghec or ghae %} | `is:internal` | Display internal repositories. |{% endif %} | `is:private` | Display private repositories. | | `archived:true` | Display archived repositories. | diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 2843f9cf9e..070c737b13 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -43,15 +43,15 @@ Name | Description **`(no scope)`** | Grants read-only access to public information (including user profile info, repository info, and gists){% endif %}{% ifversion ghes or ghae %} **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/rest/reference/enterprise-admin).{% endif %} **`repo`** | Grants full access to repositories, including private repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for repositories and organizations. Also grants ability to manage user projects. - `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. + `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code.  `repo_deployment`| Grants access to [deployment statuses](/rest/reference/repos#deployments) for {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code.{% ifversion not ghae %}  `public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.{% endif %}  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% ifversion fpt or ghes > 3.0 or ghec %}  `security_events` | Grants:
read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning)
read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning)
This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %}{% ifversion ghes < 3.1 %}  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %} -**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. - `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} or private repositories. - `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} or private repositories. +**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. + `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories. + `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories. **`admin:org`** | Fully manage the organization and its teams, projects, and memberships.  `write:org`| Read and write access to organization membership, organization projects, and team membership.  `read:org`| Read-only access to organization membership, organization projects, and team membership. diff --git a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md index b217393f00..64a578b311 100644 --- a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md @@ -17,13 +17,13 @@ topics: shortTitle: Manage forking policy --- -By default, new organizations are configured to disallow the forking of private{% if internal-repositories %} and internal{% endif %} repositories. +By default, new organizations are configured to disallow the forking of private{% ifversion ghes or ghec or ghae %} and internal{% endif %} repositories. -If you allow forking of private{% if internal-repositories %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% if internal-repositories %} or internal{% endif %} repository. For more information, see "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." +If you allow forking of private{% ifversion ghes or ghec or ghae %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% ifversion ghes or ghec or ghae %} or internal{% endif %} repository. For more information, see "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.member-privileges %}{% if internal-repositories %} +{% data reusables.organizations.member-privileges %}{% ifversion ghes or ghec or ghae %} 5. Under "Repository forking", select **Allow forking of private and internal repositories**. ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-organization.png){% endif %}{% ifversion fpt %} 5. Under "Repository forking", select **Allow forking of private repositories**. diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index a3fb556838..e2848dca3f 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -30,7 +30,7 @@ Organization owners can always create any type of repository. {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository creation", select one or more options.{% if internal-repositories %} +5. Under "Repository creation", select one or more options.{% ifversion ghes or ghec or ghae %} ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png){% endif %}{% ifversion fpt %} ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png){% endif %} 6. Click **Save**. diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index 29daf34d18..9d9b203f5a 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -60,7 +60,7 @@ If a private repository is made public and then deleted, its private forks will {% endif %} -{% if internal-repositories %} +{% ifversion ghes or ghec or ghae %} ## Changing the visibility of an internal repository diff --git a/content/repositories/creating-and-managing-repositories/about-repositories.md b/content/repositories/creating-and-managing-repositories/about-repositories.md index 7f796e3780..eab966c496 100644 --- a/content/repositories/creating-and-managing-repositories/about-repositories.md +++ b/content/repositories/creating-and-managing-repositories/about-repositories.md @@ -61,7 +61,7 @@ Organization owners always have access to every repository created in an organiz People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." -{% if internal-repositories %} +{% ifversion ghes or ghec or ghae %} ## About internal repositories {% data reusables.repositories.about-internal-repos %} For more information on innersource, see {% data variables.product.prodname_dotcom %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." diff --git a/content/repositories/creating-and-managing-repositories/deleting-a-repository.md b/content/repositories/creating-and-managing-repositories/deleting-a-repository.md index b671b0a7fc..5fb2fd7aea 100644 --- a/content/repositories/creating-and-managing-repositories/deleting-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/deleting-a-repository.md @@ -24,7 +24,7 @@ topics: **Warnings**: - Deleting a repository will **permanently** delete release attachments and team permissions. This action **cannot** be undone. -- Deleting a private{% if internal-repositories %} or internal{% endif %} repository will delete all forks of the repository. +- Deleting a private{% ifversion ghes or ghec or ghae %} or internal{% endif %} repository will delete all forks of the repository. {% endwarning %} diff --git a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md index 6bd86618c9..4af6032912 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md @@ -27,7 +27,7 @@ To browse the most used topics, go to https://github.com/topics/. Repository admins can add any topics they'd like to a repository. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% ifversion fpt or ghec %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Private repository content is not analyzed and does not receive topic suggestions.{% endif %} -{% ifversion ghae %}Internal {% else %}Public{% if internal-repositories %}, internal,{% endif %}{% endif %} and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. +{% ifversion ghae %}Internal {% else %}Public{% ifversion ghes or ghec or ghae %}, internal,{% endif %}{% endif %} and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. You can search for repositories that are associated with a particular topic. For more information, see "[Searching for repositories](/search-github/searching-on-github/searching-for-repositories#search-by-topic)." You can also search for a list of topics on {% data variables.product.product_name %}. For more information, see "[Searching topics](/search-github/searching-on-github/searching-topics)." diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md index 8479579257..1aa9bd842e 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md @@ -45,14 +45,14 @@ We recommend reviewing the following caveats before you change the visibility of ### Making a repository private {% ifversion fpt or ghes or ghec %} -* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %}{% if internal-repositories %} +* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %}{% ifversion ghes or ghec or ghae %} * If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[What happens to forks when a repository is deleted or changes visibility?](/articles/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)"{% endif %}{% ifversion fpt %} * If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products) and "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}{% ifversion fpt or ghec %} * {% data variables.product.prodname_dotcom %} will no longer include the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." * {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working unless the repository is owned by an organization that is part of an enterprise with a license for {% data variables.product.prodname_advanced_security %} and sufficient spare seats. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion ghes %} * Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} -{% if internal-repositories %} +{% ifversion ghes or ghec or ghae %} ### Making a repository internal diff --git a/content/rest/guides/getting-started-with-the-rest-api.md b/content/rest/guides/getting-started-with-the-rest-api.md index 38665d8318..df661fce4b 100644 --- a/content/rest/guides/getting-started-with-the-rest-api.md +++ b/content/rest/guides/getting-started-with-the-rest-api.md @@ -250,7 +250,7 @@ The information returned from these calls will depend on which scopes our token {% ifversion not ghae %} * A token with `public_repo` [scope][scopes] returns a response that includes all public repositories we have access to see on github.com.{% endif %} -* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% if internal-repositories %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. +* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. As the [docs][repos-api] indicate, these methods take a `type` parameter that can filter the repositories returned based on what type of access the user has diff --git a/content/search-github/searching-on-github/searching-commits.md b/content/search-github/searching-on-github/searching-commits.md index 33e8271043..0df442da93 100644 --- a/content/search-github/searching-on-github/searching-commits.md +++ b/content/search-github/searching-on-github/searching-commits.md @@ -106,7 +106,7 @@ The `is` qualifier matches commits from repositories with the specified visibili | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %}{% if internal-repositories %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %}{% ifversion ghes or ghec or ghae %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Commits) matches commits to internal repositories.{% endif %} | `is:private` | [**is:private**](https://github.com/search?q=is%3Aprivate&type=Commits) matches commits to private repositories. diff --git a/content/search-github/searching-on-github/searching-discussions.md b/content/search-github/searching-on-github/searching-discussions.md index 2e7993437c..e127550419 100644 --- a/content/search-github/searching-on-github/searching-discussions.md +++ b/content/search-github/searching-on-github/searching-discussions.md @@ -43,7 +43,7 @@ You can filter by the visibility of the repository containing the discussions us | Qualifier | Example | :- | :- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% if internal-repositories %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% ifversion ghes or ghec or ghae %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Discussions) matches discussions in internal repositories.{% endif %} | `is:private` | [**is:private tiramisu**](https://github.com/search?q=is%3Aprivate+tiramisu&type=Discussions) matches discussions that contain the word "tiramisu" in private repositories you can access. diff --git a/content/search-github/searching-on-github/searching-for-repositories.md b/content/search-github/searching-on-github/searching-for-repositories.md index c35ff753f0..d0f25c2d0c 100644 --- a/content/search-github/searching-on-github/searching-for-repositories.md +++ b/content/search-github/searching-on-github/searching-for-repositories.md @@ -149,7 +149,7 @@ You can filter your search based on the visibility of the repositories. For more | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public org:github**](https://github.com/search?q=is%3Apublic+org%3Agithub&type=Repositories) matches public repositories owned by {% data variables.product.company_short %}.{% endif %}{% if internal-repositories %} +| `is:public` | [**is:public org:github**](https://github.com/search?q=is%3Apublic+org%3Agithub&type=Repositories) matches public repositories owned by {% data variables.product.company_short %}.{% endif %}{% ifversion ghes or ghec or ghae %} | `is:internal` | [**is:internal test**](https://github.com/search?q=is%3Ainternal+test&type=Repositories) matches internal repositories that you can access and contain the word "test".{% endif %} | `is:private` | [**is:private pages**](https://github.com/search?q=is%3Aprivate+pages&type=Repositories) matches private repositories that you can access and contain the word "pages." diff --git a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md index 83ba0d0a97..53bb4c70c6 100644 --- a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md +++ b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md @@ -80,7 +80,7 @@ You can filter by the visibility of the repository containing the issues and pul | Qualifier | Example | ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Issues) matches issues and pull requests in public repositories.{% endif %}{% if internal-repositories %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Issues) matches issues and pull requests in public repositories.{% endif %}{% ifversion ghes or ghec or ghae %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Issues) matches issues and pull requests in internal repositories.{% endif %} | `is:private` | [**is:private cupcake**](https://github.com/search?q=is%3Aprivate+cupcake&type=Issues) matches issues and pull requests that contain the word "cupcake" in private repositories you can access. From 975fc1cf7c299cbe7f750bf20d21de30e43fe4d9 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:34:43 +0100 Subject: [PATCH 16/33] Update content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md Co-authored-by: Matt Pollard --- .../connecting-with-third-party-applications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md index 33ec1434e2..e70e25bdd2 100644 --- a/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md +++ b/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md @@ -67,7 +67,7 @@ There are several types of data that applications can request. | Notifications | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. However, applications remain unable to access anything in your repositories. | | Organizations and teams | Organization and teams access allows apps to access and manage organization and team membership. | | Personal user data | User data includes information found in your user profile, like your name, e-mail address, and location. | -| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either {% ifversion fpt or ghes or ghec %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories on a user-wide level. | +| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. An application can request access to all of your repositories of any visibility level. For more information, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility)." | | Repository delete | Applications can request to delete repositories that you administer, but they won't have access to your code. | ## Requesting updated permissions From 7dbf99a199d31b58d2a08281507a4d6dabbdda2f Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:35:53 +0100 Subject: [PATCH 17/33] Update content/code-security/security-overview/about-the-security-overview.md Co-authored-by: Matt Pollard --- .../security-overview/about-the-security-overview.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/content/code-security/security-overview/about-the-security-overview.md b/content/code-security/security-overview/about-the-security-overview.md index dec7077829..a883d0bff9 100644 --- a/content/code-security/security-overview/about-the-security-overview.md +++ b/content/code-security/security-overview/about-the-security-overview.md @@ -106,10 +106,14 @@ The level of risk for a repository is determined by the number and severity of a | Qualifier | Description | | -------- | -------- |{% ifversion fpt or ghes > 3.1 or ghec %} -| `is:public` | Display public repositories. |{% endif %}{% ifversion ghes or ghec or ghae %} -| `is:internal` | Display internal repositories. |{% endif %} +{%- ifversion fpt or ghes > 3.1 or ghec %} +| `is:public` | Display public repositories. | +{% elsif ghes or ghec or ghae %} +| `is:internal` | Display internal repositories. | +{%- endif %} | `is:private` | Display private repositories. | | `archived:true` | Display archived repositories. | +| `archived:true` | Display archived repositories. | ### Filter by team From bf1077cc96c45949ab29c1d7b2b570aed912e3d6 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:39:33 +0100 Subject: [PATCH 18/33] Update content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md Co-authored-by: Matt Pollard --- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 070c737b13..896d2b384e 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -43,7 +43,7 @@ Name | Description **`(no scope)`** | Grants read-only access to public information (including user profile info, repository info, and gists){% endif %}{% ifversion ghes or ghae %} **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/rest/reference/enterprise-admin).{% endif %} **`repo`** | Grants full access to repositories, including private repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for repositories and organizations. Also grants ability to manage user projects. - `repo:status`| Grants read/write access to {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. + `repo:status`| Grants read/write access to commit statuses in {% ifversion fpt %}public and private{% elsif ghec or ghes %}public, private, and internal{% elsif ghae %}private and internal{% endif %} repositories. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code.  `repo_deployment`| Grants access to [deployment statuses](/rest/reference/repos#deployments) for {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code.{% ifversion not ghae %}  `public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.{% endif %}  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% ifversion fpt or ghes > 3.0 or ghec %} From 637574872e3e9a14cd7f9717b215930ff498cb45 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:42:38 +0100 Subject: [PATCH 19/33] Update content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md Co-authored-by: Matt Pollard --- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 896d2b384e..9c53818c9c 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -49,7 +49,7 @@ Name | Description  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% ifversion fpt or ghes > 3.0 or ghec %}  `security_events` | Grants:
read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning)
read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning)
This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %}{% ifversion ghes < 3.1 %}  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %} -**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} and private repositories. The `repo` {% ifversion not ghae %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. +**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. The `repo` {% ifversion fpt or ghec or ghes %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks.  `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories.  `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories. **`admin:org`** | Fully manage the organization and its teams, projects, and memberships. From e0c1c650f2e5fb0c0e1a96da4cfb865b92aa191a Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:43:11 +0100 Subject: [PATCH 20/33] Update content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md Co-authored-by: Matt Pollard --- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 9c53818c9c..48a50607b4 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -50,7 +50,7 @@ Name | Description  `security_events` | Grants:
read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning)
read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning)
This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %}{% ifversion ghes < 3.1 %}  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %} **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. The `repo` {% ifversion fpt or ghec or ghes %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. - `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories. + `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories.  `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories. **`admin:org`** | Fully manage the organization and its teams, projects, and memberships.  `write:org`| Read and write access to organization membership, organization projects, and team membership. From fffab70ff9f9feded88377a81ed0f5e18dd7be73 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:43:26 +0100 Subject: [PATCH 21/33] Update content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md Co-authored-by: Matt Pollard --- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 48a50607b4..3dc9de0fb9 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -51,7 +51,7 @@ Name | Description  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %} **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. The `repo` {% ifversion fpt or ghec or ghes %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks.  `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. - `read:repo_hook`| Grants read and ping access to hooks in {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} or private repositories. + `read:repo_hook`| Grants read and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. **`admin:org`** | Fully manage the organization and its teams, projects, and memberships.  `write:org`| Read and write access to organization membership, organization projects, and team membership.  `read:org`| Read-only access to organization membership, organization projects, and team membership. From b12da8dee9e6ab34c327afb2710da7b4376b6a3d Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:44:31 +0100 Subject: [PATCH 22/33] Update content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md Co-authored-by: Matt Pollard --- .../removing-a-member-from-your-organization.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md index 94479856a0..160e49af6a 100644 --- a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md @@ -23,8 +23,10 @@ Only organization owners can remove members from an organization. **Warning:** When you remove members from an organization: - The paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[Downgrading your organization's paid seats](/articles/downgrading-your-organization-s-paid-seats)." -- Removed members will lose access to private forks of your organization's private repositories, but they may still have local copies. However, they cannot sync local copies with your organization's repositories. Their private forks can be restored if the user is [reinstated as an organization member](/articles/reinstating-a-former-member-of-your-organization) within three months of being removed from the organization. Ultimately, you are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property.{% ifversion ghec %} -- Removed members will also lose access to private forks of your organization's internal repositories, if the removed member is not a member of any other organization owned by the same enterprise account. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)."{% endif %} +- Removed members will lose access to private forks of your organization's private repositories, but they may still have local copies. However, they cannot sync local copies with your organization's repositories. Their private forks can be restored if the user is [reinstated as an organization member](/articles/reinstating-a-former-member-of-your-organization) within three months of being removed from the organization. Ultimately, you are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property. +{%- ifversion ghec %} +- Removed members will also lose access to private forks of your organization's internal repositories, if the removed member is not a member of any other organization owned by the same enterprise account. For more information, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)." +{%- endif %} - Any organization invitations sent by a removed member, that have not been accepted, are cancelled and will not be accessible. {% endwarning %} From 5860584db41e3867b53de4f0e4eee4e664c74aa9 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:45:30 +0100 Subject: [PATCH 23/33] Update content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md Co-authored-by: Matt Pollard --- ...aging-the-forking-policy-for-your-organization.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md index 64a578b311..841dca73ea 100644 --- a/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md @@ -23,11 +23,13 @@ If you allow forking of private{% ifversion ghes or ghec or ghae %} and internal {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.member-privileges %}{% ifversion ghes or ghec or ghae %} -5. Under "Repository forking", select **Allow forking of private and internal repositories**. - ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-organization.png){% endif %}{% ifversion fpt %} -5. Under "Repository forking", select **Allow forking of private repositories**. - ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-fpt.png){% endif %} +1. Under "Repository forking", select **Allow forking of private {% ifversion ghec or ghes or ghae %}and internal {% endif %}repositories**. + + {%- ifversion fpt %} + ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-fpt.png) + {%- elsif ghes or ghec or ghae %} + ![Checkbox to allow or disallow forking in the organization](/assets/images/help/repository/allow-disable-forking-organization.png) + {%- endif %} 6. Click **Save**. ## Further reading From 236a831f422972a5eb0a2299298cd325a89f0b8a Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:48:34 +0100 Subject: [PATCH 24/33] Update content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md Co-authored-by: Matt Pollard --- ...estricting-repository-creation-in-your-organization.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index e2848dca3f..abf040865f 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -31,6 +31,10 @@ Organization owners can always create any type of repository. {% data reusables.profile.org_settings %} {% data reusables.organizations.member-privileges %} 5. Under "Repository creation", select one or more options.{% ifversion ghes or ghec or ghae %} - ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png){% endif %}{% ifversion fpt %} - ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png){% endif %} + + {%- ifversion ghes or ghec or ghae %} + ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png) + {%- elsif fpt %} + ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png) + {%- endif %} 6. Click **Save**. From aeffbdd427210a4206fec474c5155db33b0bb341 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:09:27 +0100 Subject: [PATCH 25/33] Update data/reusables/github-actions/private-repository-forks-overview.md Co-authored-by: Matt Pollard --- .../github-actions/private-repository-forks-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/github-actions/private-repository-forks-overview.md b/data/reusables/github-actions/private-repository-forks-overview.md index 3655507623..503ecc0273 100644 --- a/data/reusables/github-actions/private-repository-forks-overview.md +++ b/data/reusables/github-actions/private-repository-forks-overview.md @@ -1,4 +1,4 @@ -If you rely on using forks of your private repositories, you can configure policies that control how users can run workflows on `pull_request` events. Available to private {% if internal-repositories %}and internal{% endif %} repositories only, you can configure these policy settings for {% ifversion ghec or ghes or ghae %}enterprises, {% endif %}organizations, or repositories.{% ifversion ghec or ghes or ghae %} For enterprises, the policies are applied to all repositories in all organizations.{% endif %} +If you rely on using forks of your private repositories, you can configure policies that control how users can run workflows on `pull_request` events. Available to private {% ifversion ghec or ghes or ghae %}and internal{% endif %} repositories only, you can configure these policy settings for {% ifversion ghec %}enterprises, {% elsif ghes or ghae %}your enterprise, {% endif %}organizations, or repositories.{% ifversion ghec or ghes or ghae %} For enterprises, the policies are applied to all repositories in all organizations.{% endif %} - **Run workflows from fork pull requests** - Allows users to run workflows from fork pull requests, using a `GITHUB_TOKEN` with read-only permission, and with no access to secrets. - **Send write tokens to workflows from pull requests** - Allows pull requests from forks to use a `GITHUB_TOKEN` with write permission. From d1f3da7c57bcfe5bdb0ac9787a96c3b3b68ef359 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:21:57 +0100 Subject: [PATCH 26/33] Update content/search-github/searching-on-github/searching-discussions.md Co-authored-by: Matt Pollard --- .../search-github/searching-on-github/searching-discussions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/search-github/searching-on-github/searching-discussions.md b/content/search-github/searching-on-github/searching-discussions.md index e127550419..dfd0e87b86 100644 --- a/content/search-github/searching-on-github/searching-discussions.md +++ b/content/search-github/searching-on-github/searching-discussions.md @@ -43,7 +43,7 @@ You can filter by the visibility of the repository containing the discussions us | Qualifier | Example | :- | :- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% ifversion ghes or ghec or ghae %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}{% ifversion ghec %} | `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Discussions) matches discussions in internal repositories.{% endif %} | `is:private` | [**is:private tiramisu**](https://github.com/search?q=is%3Aprivate+tiramisu&type=Discussions) matches discussions that contain the word "tiramisu" in private repositories you can access. From 69c57be4480c1ca99205e3671acbaefd0c4e185e Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:31:55 +0100 Subject: [PATCH 27/33] Update content/repositories/creating-and-managing-repositories/about-repositories.md Co-authored-by: Matt Pollard --- .../about-repositories.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/content/repositories/creating-and-managing-repositories/about-repositories.md b/content/repositories/creating-and-managing-repositories/about-repositories.md index eab966c496..223898ee8a 100644 --- a/content/repositories/creating-and-managing-repositories/about-repositories.md +++ b/content/repositories/creating-and-managing-repositories/about-repositories.md @@ -46,7 +46,14 @@ You can use repositories to manage your work and collaborate with others. You can restrict who has access to a repository by choosing a repository's visibility: {% ifversion ghes or ghec %}public, internal, or private{% elsif ghae %}private or internal{% else %} public or private{% endif %}. -{% ifversion ghae %}When you create a repository owned by your user account, the repository is always private. When you create a repository owned by an organization, you can choose to make the repository private or internal.{% else %}When you create a repository, you can choose to make the repository public or private.{% ifversion ghes or ghec %} If you're creating the repository in an organization{% ifversion ghec %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %}{% endif %}{% ifversion fpt %} Repositories in organizations that use {% data variables.product.prodname_ghe_cloud %} can also be created with internal visibility. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)" in the {% data variables.product.prodname_ghe_cloud %} documentation. +{% ifversion fpt or ghec or ghes %} + +When you create a repository, you can choose to make the repository public or private.{% ifversion ghec or ghes %} If you're creating the repository in an organization{% ifversion ghec %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %}{% endif %}{% ifversion fpt %} Repositories in organizations that use {% data variables.product.prodname_ghe_cloud %} can also be created with internal visibility. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)" in the {% data variables.product.prodname_ghe_cloud %} documentation. + +{% elsif ghae %} + +When you create a repository owned by your user account, the repository is always private. When you create a repository owned by an organization, you can choose to make the repository private or internal. + {% endif %} {% ifversion ghes %} From f4806b313fd429ef8b247788c956d71529091af6 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:35:46 +0100 Subject: [PATCH 28/33] Update content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md Co-authored-by: Matt Pollard --- .../classifying-your-repository-with-topics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md index 4af6032912..2aa2f07f4f 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics.md @@ -27,7 +27,7 @@ To browse the most used topics, go to https://github.com/topics/. Repository admins can add any topics they'd like to a repository. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% ifversion fpt or ghec %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Private repository content is not analyzed and does not receive topic suggestions.{% endif %} -{% ifversion ghae %}Internal {% else %}Public{% ifversion ghes or ghec or ghae %}, internal,{% endif %}{% endif %} and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. +{% ifversion fpt %}Public and private{% elsif ghec or ghes %}Public, private, and internal{% elsif ghae %}Private and internal{% endif %} repositories can have topics, although you will only see private repositories that you have access to in topic search results. You can search for repositories that are associated with a particular topic. For more information, see "[Searching for repositories](/search-github/searching-on-github/searching-for-repositories#search-by-topic)." You can also search for a list of topics on {% data variables.product.product_name %}. For more information, see "[Searching topics](/search-github/searching-on-github/searching-topics)." From 0286d46db49dad73de07f41a930af084a096f5eb Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:36:39 +0100 Subject: [PATCH 29/33] Delete internal-repositories.yml --- data/features/internal-repositories.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 data/features/internal-repositories.yml diff --git a/data/features/internal-repositories.yml b/data/features/internal-repositories.yml deleted file mode 100644 index 6dd81c9205..0000000000 --- a/data/features/internal-repositories.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Documentation for internal repositories. -versions: - ghec: '*' - ghae: '*' - ghes: '>=3.0' From 5fe77054cb62370e8e1edc586abeeab9532cd52b Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:38:59 +0100 Subject: [PATCH 30/33] Update content/rest/guides/discovering-resources-for-a-user.md Co-authored-by: Matt Pollard --- content/rest/guides/discovering-resources-for-a-user.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rest/guides/discovering-resources-for-a-user.md b/content/rest/guides/discovering-resources-for-a-user.md index dd52889117..74f1211882 100644 --- a/content/rest/guides/discovering-resources-for-a-user.md +++ b/content/rest/guides/discovering-resources-for-a-user.md @@ -26,7 +26,7 @@ If you haven't already, you should read the ["Basics of Authentication"][basics- ## Discover the repositories that your app can access for a user -In addition to having their own personal repositories, a user may be a collaborator on repositories owned by other users and organizations. Collectively, these are the repositories where the user has privileged access: either it's a private repository where the user has read or write access, or it's a{% ifversion ghae %}n{% endif %} {% ifversion not ghae %}public{% endif %}{% ifversion ghec %} or {% endif %}{% ifversion ghae or ghec %}internal{% endif %} repository where the user has write access. +In addition to having their own personal repositories, a user may be a collaborator on repositories owned by other users and organizations. Collectively, these are the repositories where the user has privileged access: either it's a private repository where the user has read or write access, or it's {% ifversion fpt %}a public{% elsif ghec or ghes %}a public or internal{% elsif ghae %}an internal{% endif %} repository where the user has write access. [OAuth scopes][scopes] and [organization application policies][oap] determine which of those repositories your app can access for a user. Use the workflow below to discover those repositories. From c456b91ca4b07cb761cf8c5428ee527d10609cce Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 13:22:41 +0100 Subject: [PATCH 31/33] incorporate feedback from matt --- ...epository-creation-in-your-organization.md | 8 +++--- .../about-repositories.md | 19 ++++++++------ .../setting-repository-visibility.md | 25 +++++++++++++------ .../getting-started-with-the-rest-api.md | 7 +++--- .../searching-on-github/searching-commits.md | 12 ++++++--- .../actions/about-artifact-log-retention.md | 5 +++- .../enabled-actions-description.md | 2 +- 7 files changed, 52 insertions(+), 26 deletions(-) diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index abf040865f..7f1c181bd9 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -15,11 +15,11 @@ topics: shortTitle: Restrict repository creation --- -You can choose whether members can create repositories in your organization. If you allow members to create repositories, you can choose which types of repositories members can create.{% ifversion fpt or ghec %} To allow members to create private repositories only, your organization must use {% data variables.product.prodname_ghe_cloud %}.{% endif %} For more information, see "[About repositories](/enterprise-cloud@latest/repositories/creating-and-managing-repositories/about-repositories)" in the {% data variables.product.prodname_ghe_cloud %} documentation. +You can choose whether members can create repositories in your organization. If you allow members to create repositories, you can choose which types of repositories members can create.{% ifversion fpt or ghec %} To allow members to create private repositories only, your organization must use {% data variables.product.prodname_ghe_cloud %}.{% endif %}{% ifversion fpt %} For more information, see "[About repositories](/enterprise-cloud@latest/repositories/creating-and-managing-repositories/about-repositories)" in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. Organization owners can always create any type of repository. - -{% ifversion fpt or ghec %}Enterprise owners{% else %}Site administrators{% endif %} can restrict the options you have available for your organization's repository creation policy. For more information, see{% ifversion fpt %} "[Restricting repository creation in your enterprise](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise)."{% endif %}{% ifversion ghec or ghes or ghae %} "[Restricting repository creation in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#setting-a-policy-for-repository-creation)."{% endif %} +{% ifversion ghec or ghae or ghes %} +{% ifversion ghec or ghae %}Enterprise owners{% elsif ghes %}Site administrators{% endif %} can restrict the options you have available for your organization's repository creation policy.{% ifversion ghec or ghes or ghae %} For more information, see "[Restricting repository creation in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#setting-a-policy-for-repository-creation)."{% endif %}{% endif %} {% warning %} @@ -30,7 +30,7 @@ Organization owners can always create any type of repository. {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository creation", select one or more options.{% ifversion ghes or ghec or ghae %} +5. Under "Repository creation", select one or more options. {%- ifversion ghes or ghec or ghae %} ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png) diff --git a/content/repositories/creating-and-managing-repositories/about-repositories.md b/content/repositories/creating-and-managing-repositories/about-repositories.md index 223898ee8a..6a27e9ea41 100644 --- a/content/repositories/creating-and-managing-repositories/about-repositories.md +++ b/content/repositories/creating-and-managing-repositories/about-repositories.md @@ -56,13 +56,18 @@ When you create a repository owned by your user account, the repository is alway {% endif %} -{% ifversion ghes %} -If {% data variables.product.product_location %} is not in private mode or behind a firewall, public repositories are accessible to everyone on the internet. Otherwise, public repositories are available to everyone using {% data variables.product.product_location %}, including outside collaborators. Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. {% ifversion ghes %} Internal repositories are accessible to enterprise members. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} -{% elsif ghae %} -Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to all enterprise members. For more information, see "[About internal repositories](#about-internal-repositories)." -{% else %} -Public repositories are accessible to everyone on the internet. Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to enterprise members. For more information, see "[About internal repositories](/enterprise-cloud@latest/repositories/creating-and-managing-repositories/about-repositories#about-internal-repositories)"{% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %} -{% endif %} +{%- ifversion fpt or ghec %} +- Public repositories are accessible to everyone on the internet. +- Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. +{%- elsif ghes %} +- If {% data variables.product.product_location %} is not in private mode or behind a firewall, public repositories are accessible to everyone on the internet. Otherwise, public repositories are available to everyone using {% data variables.product.product_location %}, including outside collaborators. +- Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to all enterprise members. +{%- elsif ghae %} +- Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. +{%- endif %} +{%- ifversion ghec or ghes or ghae %} +- Internal repositories are accessible to all enterprise members. For more information, see "[About internal repositories](#about-internal-repositories)." +{%- endif %} Organization owners always have access to every repository created in an organization. For more information, see "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)." diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md index 1aa9bd842e..1841cf3ab9 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md @@ -21,9 +21,9 @@ shortTitle: Repository visibility Organization owners can restrict the ability to change repository visibility to organization owners only. For more information, see "[Restricting repository visibility changes in your organization](/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization)." -{% ifversion fpt or ghec %} +{% ifversion ghec %} -Members of an {% data variables.product.prodname_emu_enterprise %} can only set the visibility of repositories owned by their user account to private, and repositories in their enterprise's organizations can only be private or internal.{% ifversion fpt %} For more information, see "[About Enterprise Managed Users](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %} +Members of an {% data variables.product.prodname_emu_enterprise %} can only set the visibility of repositories owned by their user account to private, and repositories in their enterprise's organizations can only be private or internal. For more information, see "[About {% data variables.product.prodname_emus %}](/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)." {% endif %} @@ -45,12 +45,23 @@ We recommend reviewing the following caveats before you change the visibility of ### Making a repository private {% ifversion fpt or ghes or ghec %} -* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %}{% ifversion ghes or ghec or ghae %} -* If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[What happens to forks when a repository is deleted or changes visibility?](/articles/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)"{% endif %}{% ifversion fpt %} -* If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products) and "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}{% ifversion fpt or ghec %} +* {% data variables.product.product_name %} will detach public forks of the public repository and put them into a new network. Public forks are not made private.{% endif %} +{%- ifversion ghes or ghec or ghae %} +* If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[What happens to forks when a repository is deleted or changes visibility?](/articles/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)" +{%- endif %} + +{%- ifversion fpt %} +* If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products) and "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)." +{%- endif %} + +{%- ifversion fpt or ghec %} * {% data variables.product.prodname_dotcom %} will no longer include the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." -* {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working unless the repository is owned by an organization that is part of an enterprise with a license for {% data variables.product.prodname_advanced_security %} and sufficient spare seats. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion ghes %} -* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} +* {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working unless the repository is owned by an organization that is part of an enterprise with a license for {% data variables.product.prodname_advanced_security %} and sufficient spare seats. {% data reusables.advanced-security.more-info-ghas %} +{%- endif %} + +{%- ifversion ghes %} +* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)." +{%- endif %} {% ifversion ghes or ghec or ghae %} diff --git a/content/rest/guides/getting-started-with-the-rest-api.md b/content/rest/guides/getting-started-with-the-rest-api.md index df661fce4b..74ab5b1968 100644 --- a/content/rest/guides/getting-started-with-the-rest-api.md +++ b/content/rest/guides/getting-started-with-the-rest-api.md @@ -248,9 +248,10 @@ $ curl -i {% data variables.product.api_url_pre %}/orgs/octo-org/repos The information returned from these calls will depend on which scopes our token has when we authenticate: -{% ifversion not ghae %} -* A token with `public_repo` [scope][scopes] returns a response that includes all public repositories we have access to see on github.com.{% endif %} -* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion not ghae %}public{% endif %}{% ifversion ghec or ghes %}, {% endif %}{% ifversion ghes or ghec or ghae %}internal{% endif %} and private repositories we have access to see on {% data variables.product.product_location %}. +{%- ifversion fpt or ghec or ghes %} +* A token with `public_repo` [scope][scopes] returns a response that includes all public repositories we have access to see on {% data variables.product.product_location %}. +{%- endif %} +* A token with `repo` [scope][scopes] returns a response that includes all {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories we have access to see on {% data variables.product.product_location %}. As the [docs][repos-api] indicate, these methods take a `type` parameter that can filter the repositories returned based on what type of access the user has diff --git a/content/search-github/searching-on-github/searching-commits.md b/content/search-github/searching-on-github/searching-commits.md index 0df442da93..e7f31a7604 100644 --- a/content/search-github/searching-on-github/searching-commits.md +++ b/content/search-github/searching-on-github/searching-commits.md @@ -105,9 +105,15 @@ To search commits in all repositories owned by a certain user or organization, u The `is` qualifier matches commits from repositories with the specified visibility. For more information, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility)." | Qualifier | Example -| ------------- | ------------- |{% ifversion fpt or ghes or ghec %} -| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories.{% endif %}{% ifversion ghes or ghec or ghae %} -| `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Commits) matches commits to internal repositories.{% endif %} +| ------------- | ------------- | +{%- ifversion fpt or ghes or ghec %} +| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Commits) matches commits to public repositories. +{%- endif %} + +{%- ifversion ghes or ghec or ghae %} +| `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Commits) matches commits to internal repositories. +{%- endif %} + | `is:private` | [**is:private**](https://github.com/search?q=is%3Aprivate&type=Commits) matches commits to private repositories. ## Further reading diff --git a/data/reusables/actions/about-artifact-log-retention.md b/data/reusables/actions/about-artifact-log-retention.md index 906edec21e..6f73937277 100644 --- a/data/reusables/actions/about-artifact-log-retention.md +++ b/data/reusables/actions/about-artifact-log-retention.md @@ -1,6 +1,9 @@ By default, the artifacts and log files generated by workflows are retained for 90 days before they are automatically deleted. You can adjust the retention period, depending on the type of repository: +{%- ifversion fpt or ghec or ghes %} - For public repositories: you can change this retention period to anywhere between 1 day or 90 days. -- For private, internal, and {% data variables.product.prodname_ghe_server %} repositories: you can change this retention period to anywhere between 1 day or 400 days. +{%- endif %} + +- For private{% ifversion ghec or ghes or ghae %} and internal{% endif %} repositories: you can change this retention period to anywhere between 1 day or 400 days. When you customize the retention period, it only applies to new artifacts and log files, and does not retroactively apply to existing objects. For managed repositories and organizations, the maximum retention period cannot exceed the limit set by the managing organization or enterprise. diff --git a/data/reusables/github-actions/enabled-actions-description.md b/data/reusables/github-actions/enabled-actions-description.md index 3e8b54c012..dcf8ff62c2 100644 --- a/data/reusables/github-actions/enabled-actions-description.md +++ b/data/reusables/github-actions/enabled-actions-description.md @@ -1 +1 @@ -When you enable {% data variables.product.prodname_actions %}, workflows are able to run actions located within your repository and any other public repository. +When you enable {% data variables.product.prodname_actions %}, workflows are able to run actions located within your repository and any other{% ifversion fpt %} public{% elsif ghec or ghes %} public or interal{% elsif ghae %} internal{% endif %} repository. From e4365c727d1dba4ded19237f39bd86363fe57d42 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 13:24:21 +0100 Subject: [PATCH 32/33] fixed typo --- data/reusables/github-actions/enabled-actions-description.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/github-actions/enabled-actions-description.md b/data/reusables/github-actions/enabled-actions-description.md index dcf8ff62c2..3f5092e9ca 100644 --- a/data/reusables/github-actions/enabled-actions-description.md +++ b/data/reusables/github-actions/enabled-actions-description.md @@ -1 +1 @@ -When you enable {% data variables.product.prodname_actions %}, workflows are able to run actions located within your repository and any other{% ifversion fpt %} public{% elsif ghec or ghes %} public or interal{% elsif ghae %} internal{% endif %} repository. +When you enable {% data variables.product.prodname_actions %}, workflows are able to run actions located within your repository and any other{% ifversion fpt %} public{% elsif ghec or ghes %} public or internal{% elsif ghae %} internal{% endif %} repository. From ea29dc1a2a45eec7dc622fd0ef293acc6dbce79d Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Mon, 29 Nov 2021 13:42:06 +0100 Subject: [PATCH 33/33] fix broken links --- .../security-overview/about-the-security-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/code-security/security-overview/about-the-security-overview.md b/content/code-security/security-overview/about-the-security-overview.md index a883d0bff9..15013c110e 100644 --- a/content/code-security/security-overview/about-the-security-overview.md +++ b/content/code-security/security-overview/about-the-security-overview.md @@ -105,7 +105,7 @@ The level of risk for a repository is determined by the number and severity of a ### Filter by repository type | Qualifier | Description | -| -------- | -------- |{% ifversion fpt or ghes > 3.1 or ghec %} +| -------- | -------- | {%- ifversion fpt or ghes > 3.1 or ghec %} | `is:public` | Display public repositories. | {% elsif ghes or ghec or ghae %}