Skip to content

Commit 0c46a90

Browse files
jschnapperjc-clark
andauthored
Fix ruleset history and import/export release (#57858)
Co-authored-by: Joe Clark <31087804+jc-clark@users.noreply.github.com>
1 parent d13bb2c commit 0c46a90

File tree

9 files changed

+32
-21
lines changed

9 files changed

+32
-21
lines changed

content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/managing-policies-for-code-governance.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ You can edit a ruleset to change parts of the ruleset, such as the name, bypass
4444
1. In the left sidebar, in the "Policies" section, click **Code**, then click **Rulesets**.
4545
1. To the right of the ruleset's name, select {% octicon "kebab-horizontal" aria-label="Open additional options" %}, then click **{% octicon "trash" aria-hidden="true" aria-label="trash" %} Delete ruleset**.
4646

47+
{% ifversion repo-rules-history %}
48+
4749
## Using ruleset history
4850

4951
{% data reusables.repositories.ruleset-beta-note %}
@@ -55,6 +57,10 @@ You can edit a ruleset to change parts of the ruleset, such as the name, bypass
5557
1. To view the history of changes to the ruleset, select {% octicon "kebab-horizontal" aria-label="Open additional options" %} to the right of the ruleset's name, then click **{% octicon "history" aria-hidden="true" aria-label="history" %} History**.
5658
1. To the right of the specific iteration, select {% octicon "kebab-horizontal" aria-label="Open additional options" %}, then click **Compare changes**, **Restore**, or **Download**.
5759

60+
{% endif %}
61+
62+
{% ifversion repo-rules-management %}
63+
5864
## Importing a ruleset
5965

6066
You can import a ruleset from another repository, organization or enterprise using the exported JSON file from the previous section. This can be useful if you want to apply the same ruleset to multiple repositories, organizations or enterprises.
@@ -65,6 +71,8 @@ You can import a ruleset from another repository, organization or enterprise usi
6571
1. Open the exported JSON file.
6672
1. Review the imported ruleset and click **Create**.
6773

74+
{% endif %}
75+
6876
## Viewing insights for rulesets
6977

7078
You can view insights for rulesets to see how rulesets are affecting the repositories in your enterprise. {% data reusables.repositories.about-ruleset-insights %}

content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Forks _do_ inherit push rulesets from their root repository. {% data reusables.r
3434
To import one of the prebuilt rulesets by {% data variables.product.prodname_dotcom %}, see [`github/ruleset-recipes`](https://github.com/github/ruleset-recipes).
3535

3636
{% ifversion repo-rules-management %}
37-
{% 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 %}
37+
{% data reusables.repositories.import-a-ruleset-conceptual %} For more information, see [AUTOTITLE](/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization#importing-a-ruleset).{% endif %}
3838

3939
## Using `fnmatch` syntax
4040

content/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ You can use the REST and GraphQL APIs to manage rulesets. For more information,
4343
{% data reusables.organizations.access-ruleset-settings %}
4444
{% data reusables.repositories.delete-ruleset-steps %}
4545

46-
{% ifversion repo-rules-management %}
46+
{% ifversion repo-rules-history %}
4747

4848
## Using ruleset history
4949

@@ -56,7 +56,11 @@ You can use the REST and GraphQL APIs to manage rulesets. For more information,
5656
{% data reusables.organizations.access-ruleset-settings %}
5757
{% data reusables.repositories.ruleset-history %}
5858

59-
### Importing a ruleset
59+
{% endif %}
60+
61+
{% ifversion repo-rules-management %}
62+
63+
## Importing a ruleset
6064

6165
You can import a ruleset from another repository or organization using the exported JSON file from the previous section. This can be useful if you want to apply the same ruleset to multiple repositories or organizations.
6266

content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ For customers on {% data variables.product.prodname_team %} and {% data variable
3434

3535
To import one of the prebuilt rulesets by {% data variables.product.prodname_dotcom %}, see [`github/ruleset-recipes`](https://github.com/github/ruleset-recipes).
3636

37-
{% 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 %}
37+
{% data reusables.repositories.import-a-ruleset-conceptual %} For more information, see [AUTOTITLE](/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization#importing-a-ruleset).{% endif %}
3838

3939
## Using `fnmatch` syntax
4040

content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/managing-rulesets-for-a-repository.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,31 +73,31 @@ You can also view active ruselets:
7373
{% data reusables.repositories.repo-rulesets-settings %}
7474
{% data reusables.repositories.delete-ruleset-steps %}
7575

76-
{% ifversion repo-rules-management %}
76+
{% ifversion repo-rules-history %}
7777

78-
## Importing a ruleset
78+
## Using ruleset history
7979

80-
{% data reusables.repositories.import-a-ruleset-conceptual %}
80+
{% data reusables.repositories.ruleset-beta-note %}
81+
82+
{% data reusables.repositories.ruleset-history-conceptual %}
8183

8284
{% data reusables.repositories.navigate-to-repo %}
8385
{% data reusables.repositories.sidebar-settings %}
8486
{% data reusables.repositories.repo-rulesets-settings %}
85-
{% data reusables.repositories.import-a-ruleset %}
87+
{% data reusables.repositories.ruleset-history %}
8688

8789
{% endif %}
8890

89-
{% ifversion repo-rules-enterprise %}
90-
91-
## Using ruleset history
91+
{% ifversion repo-rules-management %}
9292

93-
{% data reusables.repositories.ruleset-beta-note %}
93+
## Importing a ruleset
9494

95-
{% data reusables.repositories.ruleset-history-conceptual %}
95+
{% data reusables.repositories.import-a-ruleset-conceptual %}
9696

9797
{% data reusables.repositories.navigate-to-repo %}
9898
{% data reusables.repositories.sidebar-settings %}
9999
{% data reusables.repositories.repo-rulesets-settings %}
100-
{% data reusables.repositories.ruleset-history %}
100+
{% data reusables.repositories.import-a-ruleset %}
101101

102102
## Viewing insights for rulesets
103103

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Reference: #20126
2+
# Ruleset history
3+
versions:
4+
ghec: '*'
5+
ghes: '>=3.19'

data/features/repo-rules-management.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Reference: #11915 and #16558
2-
# Ruleset management public preview and GA
2+
# Ruleset management (import/export) public preview and GA
33
versions:
44
fpt: '*'
55
ghec: '*'

data/release-notes/enterprise-server/3-17/0-rc1.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ sections:
118118
# https://github.com/github/releases/issues/4042
119119
- |
120120
Push rulesets are generally available. Users can block pushes to private and internal repositories, and their forks, based on file type, path, or size. Unlike pre-receive hooks, push rules are built-in, configurable via the UI or API, and support audit logs, evaluate mode, and bypass lists. See [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets#push-rulesets).
121-
# https://github.com/github/releases/issues/5128
122-
- |
123-
Enterprise administrators can manage rules more efficiently with the general availability of ruleset history, import, and export. Ruleset history allows tracking and rolling back changes, while import and export simplify sharing and reusing rulesets, including GitHub's ruleset-recipes. See [`github/ruleset-recipes`](https://github.com/github/ruleset-recipes).
124121
# https://github.com/github/releases/issues/5129
125122
- |
126123
Repository administrators can easily convert a fork into a standalone repository by leaving the fork network, which stops automatic syncing with the upstream repository. This is useful for taking a project in a new direction or maintaining separate versions.

data/release-notes/enterprise-server/3-17/0.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,6 @@ sections:
122122
# https://github.com/github/releases/issues/4042
123123
- |
124124
Push rulesets are generally available. Users can block pushes to private and internal repositories, and their forks, based on file type, path, or size. Unlike pre-receive hooks, push rules are built-in, configurable via the UI or API, and support audit logs, evaluate mode, and bypass lists. See [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets#push-rulesets).
125-
# https://github.com/github/releases/issues/5128
126-
- |
127-
Enterprise administrators can manage rules more efficiently with the general availability of ruleset history, import, and export. Ruleset history allows tracking and rolling back changes, while import and export simplify sharing and reusing rulesets, including GitHub's ruleset-recipes. See [`github/ruleset-recipes`](https://github.com/github/ruleset-recipes).
128125
# https://github.com/github/releases/issues/5129
129126
- |
130127
Repository administrators can easily convert a fork into a standalone repository by leaving the fork network, which stops automatic syncing with the upstream repository. This is useful for taking a project in a new direction or maintaining separate versions.

0 commit comments

Comments
 (0)