diff --git a/assets/images/help/repository/import-a-ruleset.png b/assets/images/help/repository/import-a-ruleset.png index 55bcd771ad..cf271cde7b 100644 Binary files a/assets/images/help/repository/import-a-ruleset.png and b/assets/images/help/repository/import-a-ruleset.png differ diff --git a/assets/images/help/repository/ruleset-history.png b/assets/images/help/repository/ruleset-history.png index bb78879e17..86d7be3dc5 100644 Binary files a/assets/images/help/repository/ruleset-history.png and b/assets/images/help/repository/ruleset-history.png differ diff --git a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance.md b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance.md index 0de725a8aa..5c7a9d0bf0 100644 --- a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance.md +++ b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance.md @@ -25,13 +25,11 @@ You can create rulesets to control how users can interact with code in repositor To learn more, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets). -## Importing prebuilt rulesets +## Importing rulesets To import a prebuilt ruleset created by {% data variables.product.company_short %}, see [`github/ruleset-recipes`](https://github.com/github/ruleset-recipes). -{% ifversion repo-rules-management %} {% data reusables.repositories.import-a-ruleset-conceptual %} For more information, see [AUTOTITLE](/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization#using-ruleset-history). -{% endif %} ## How will I define where my ruleset applies? diff --git a/data/features/repo-rules-management.yml b/data/features/repo-rules-management.yml index 2ef260be74..eeb9c63882 100644 --- a/data/features/repo-rules-management.yml +++ b/data/features/repo-rules-management.yml @@ -1,5 +1,6 @@ -# Reference: #11915 -# Ruleset management public beta +# Reference: #11915 and #16558 +# Ruleset management public preview and GA versions: fpt: '*' ghec: '*' + ghes: '>=3.17' diff --git a/data/reusables/repositories/ruleset-beta-note.md b/data/reusables/repositories/ruleset-beta-note.md index 76051d176c..ccdd55dd01 100644 --- a/data/reusables/repositories/ruleset-beta-note.md +++ b/data/reusables/repositories/ruleset-beta-note.md @@ -1,3 +1,2 @@ > [!NOTE] -> * Ruleset history is currently in {% data variables.release-phases.public_preview %} and subject to change. -> * Only changes made to a ruleset after the {% data variables.release-phases.public_preview %} release, on October 11, 2023, are included in the ruleset history. +> {% ifversion ghes > 3.16 %}Only changes made to a ruleset after you have upgraded to {% data variables.product.prodname_ghe_server %} 3.17.0, or a later version, are included in the ruleset history.{% elsif fpt or ghec %}Only changes made to a ruleset after the {% data variables.release-phases.public_preview %} release, on October 11, 2023, are included in the ruleset history.{% endif %}