Skip to content

Commit a192f8e

Browse files
authored
Merge pull request #64488 from github/repo-sync
Repo sync
2 parents 15c4e3f + f63f0ee commit a192f8e

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

‎content/actions/concepts/runners/github-hosted-runners.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ If your workflows depend on network allowlists or Azure SDK credentials, running
116116

117117
In addition, if the workflow run has been successfully queued, but has not been processed by a {% data variables.product.prodname_dotcom %}-hosted runner within 45 minutes, then the queued workflow run is discarded.
118118

119-
## The `etc/hosts` file
119+
## The `/etc/hosts` file
120120

121121
{% data reusables.actions.runners-etc-hosts-file %}
122122

‎content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ When you create a branch rule, the branch you specify doesn't have to exist yet
7474
1. Optionally, select **Require conversation resolution before merging**.
7575
1. Optionally, select **Require signed commits**.
7676
1. Optionally, select **Require linear history**.
77-
1. Optionally, to merge pull requests using a merge queue, select **Require merge queue**. {% data reusables.pull_requests.merge-queue-references %}
77+
1. Optionally, to merge pull requests using a merge queue, select **Require merge queue**.
78+
79+
> [!NOTE]
80+
> {% ifversion fpt or ghec %}Pull request merge queues are available in any public repository owned by an organization, or in private repositories owned by organizations using {% data variables.product.prodname_ghe_cloud %}. {% data reusables.gated-features.more-info %}{% elsif ghes %}Pull request merge queues are available in any organization-owned repository on {% data variables.product.prodname_ghe_server %}.{% endif %} {% data reusables.pull_requests.merge-queue-references %}
81+
7882
1. Optionally, to choose which environments the changes must be successfully deployed to before merging, select **Require deployments to succeed before merging**, then select the environments.
7983
1. Optionally, make the branch read-only.
8084
* Select **Lock branch**.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{% data variables.product.prodname_dotcom %}-hosted runners are provisioned with an `etc/hosts` file that blocks network access to various cryptocurrency mining pools and malicious sites. Hosts such as MiningMadness.com and cpu-pool.com are rerouted to localhost so that they do not present a significant security risk.
1+
{% data variables.product.prodname_dotcom %}-hosted runners are provisioned with an `/etc/hosts` file that blocks network access to various cryptocurrency mining pools and malicious sites. Hosts such as MiningMadness.com and cpu-pool.com are rerouted to localhost so that they do not present a significant security risk.

0 commit comments

Comments
 (0)