Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
word-wiz committed Sep 10, 2024
2 parents a9d9f34 + 8e38497 commit 38b68e4
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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**.
Expand Down
5 changes: 5 additions & 0 deletions data/features/custom-properties-on-create.yml
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 2 additions & 0 deletions data/reusables/repositories/push-rules-fork-network-note.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
> [!NOTE]
> This ruleset will enforce push restrictions for this repository's entire fork network.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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 %}

0 comments on commit 38b68e4

Please sign in to comment.