Merge pull request #34554 from github/repo-sync

Repo sync
github · Sep 10, 2024 · 8e38497 · 8e38497
2 parents 93bdac2 + dae3abb
commit 8e38497
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 20 deletions.
diff --git a/...rganization-settings/creating-rulesets-for-repositories-in-your-organization.md b/...rganization-settings/creating-rulesets-for-repositories-in-your-organization.md
@@ -17,8 +17,6 @@ You can create rulesets in your organization to control how users can interact w
 
 {% data reusables.repositories.rulesets-push-rulesets-intro %}
 
-{% data reusables.repositories.rulesets-push-rules-beta-note %}
-
 {% endif %}
 
 Forks do not inherit branch or tag rulesets from their upstream repositories. However, forks owned by your organization are subject to the rulesets you create, like any other repository.
@@ -88,9 +86,7 @@ To import one of the prebuilt rulesets by {% data variables.product.prodname_dot
 
 ## Creating a push ruleset
 
-{% data reusables.repositories.rulesets-push-rules-beta-note %}
->
-> This ruleset will enforce push restrictions for this repository's entire fork network.
+{% data reusables.repositories.push-rules-fork-network-note %}
 
 You can create a push ruleset for private or internal repositories in your organization.
 

diff --git a/...borating-with-pull-requests/getting-started/best-practices-for-pull-requests.md b/...borating-with-pull-requests/getting-started/best-practices-for-pull-requests.md
@@ -60,8 +60,6 @@ You can use protected branches to prevent pull requests from being merged into i
 
 ### Use push rulesets
 
-{% data reusables.repositories.rulesets-push-rules-beta-note %}
-
 {% data reusables.repositories.push-rulesets-overview %}
 
 For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets#push-rulesets)."

diff --git a/...h-pull-requests/working-with-forks/about-permissions-and-visibility-of-forks.md b/...h-pull-requests/working-with-forks/about-permissions-and-visibility-of-forks.md
@@ -44,8 +44,6 @@ Public forks do not inherit the permissions structure of the upstream repository
 
 ### About push rulesets for forked repositories
 
-{% data reusables.repositories.rulesets-push-rules-beta-note %}
-
 {% data reusables.repositories.rulesets-push-rulesets-fork-network-information %}
 
 For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets#push-rulesets)."

diff --git a/...ring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets.md b/...ring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets.md
@@ -26,8 +26,6 @@ For organizations on the {% data variables.product.prodname_enterprise %} and {%
 
 You can use rulesets to target branches or tags in a repository or to block pushes to a repository and the repository's entire fork network.
 
-{% data reusables.repositories.rulesets-push-rules-beta-note %}
-
 {% endif %}
 
 {% ifversion push-rule-delegated-bypass %}
@@ -46,8 +44,6 @@ For each ruleset you create, you specify which branches or tags in your reposito
 
 ### Push rulesets
 
-{% data reusables.repositories.rulesets-push-rules-beta-note %}
-
 {% data reusables.repositories.push-rulesets-overview %}
 
 {% endif %}

diff --git a/...rges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository.md b/...rges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository.md
@@ -18,8 +18,6 @@ You can create rulesets to control how users can interact with selected branches
 
 {% data reusables.repositories.rulesets-push-rulesets-intro %}
 
-{% data reusables.repositories.rulesets-push-rules-beta-note %}
-
 {% endif %}
 
 When you create a ruleset, you can allow certain users to bypass the rules in the ruleset.
@@ -85,9 +83,7 @@ To import one of the prebuilt rulesets by {% data variables.product.prodname_dot
 
 ## Creating a push ruleset
 
-{% data reusables.repositories.rulesets-push-rules-beta-note %}
->
-> This ruleset will enforce push restrictions for this repository's entire fork network.
+{% data reusables.repositories.push-rules-fork-network-note %}
 
 You can create a push ruleset for private or internal repositories.
 

diff --git a/...nt/repositories/creating-and-managing-repositories/creating-a-new-repository.md b/...nt/repositories/creating-and-managing-repositories/creating-a-new-repository.md
@@ -47,6 +47,8 @@ topics:
     * You can create a _.gitignore_ file, which is a set of ignore rules. For more information, see "[AUTOTITLE](/get-started/getting-started-with-git/ignoring-files)."{% ifversion fpt or ghec %}
     * You can choose to add a software license for your project. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository)."{% endif %}
 {% data reusables.repositories.select-marketplace-apps %}
+{%- ifversion custom-properties-on-create %}
+1. If custom properties are required for repository creation, set the required properties for the repository. For more information, see "[AUTOTITLE](/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization)."{% endif %}
 {% data reusables.repositories.create-repo %}
 {% ifversion fpt or ghec %}
 1. At the bottom of the resulting Quick Setup page, under "Import code from an old repository", you can choose to import a project to your new repository. To do so, click **Import code**.

diff --git a/data/features/custom-properties-on-create.yml b/data/features/custom-properties-on-create.yml
@@ -0,0 +1,5 @@
+# Reference: #15332
+# Allows actors with the ability to create repos to be required to enter custom properties on repo creation.
+versions:
+  ghec: '*'
+  ghes: '>= 3.15'
diff --git a/data/reusables/repositories/push-rules-fork-network-note.md b/data/reusables/repositories/push-rules-fork-network-note.md
@@ -0,0 +1,2 @@
+> [!NOTE]
+> This ruleset will enforce push restrictions for this repository's entire fork network.
diff --git a/data/reusables/repositories/rulesets-push-rules-beta-note.md b/data/reusables/repositories/rulesets-push-rules-beta-note.md
diff --git a/...reusables/repositories/rulesets-push-rules-general-info-for-related-articles.md b/...reusables/repositories/rulesets-push-rules-general-info-for-related-articles.md
@@ -1,2 +1 @@
 Your repository may have push rulesets enabled. Push rulesets may block creating a new file in the repository based on certain restrictions. Push rulesets apply to the repository's entire fork network. Which means that any push rulesets that are configured in the root repository will also apply to every fork of the repository. For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets#about-rulesets)."
-   {% data reusables.repositories.rulesets-push-rules-beta-note %}