Merge pull request github#28817 from github/repo-sync

Repo sync
ebfork · Oct 3, 2023 · 6c07ed5 · 6c07ed5
2 parents 056f09d + 9f54888
commit 6c07ed5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/...ithub-hosted-runners/about-github-hosted-runners/about-github-hosted-runners.md b/...ithub-hosted-runners/about-github-hosted-runners/about-github-hosted-runners.md
@@ -24,6 +24,16 @@ Runners are the machines that execute jobs in a {% data variables.product.prodna
 
 {% data variables.product.prodname_dotcom %} provides runners that you can use to run your jobs, or you can [host your own runners](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners). Each {% data variables.product.prodname_dotcom %}-hosted runner is a new virtual machine (VM) hosted by {% data variables.product.prodname_dotcom %} with the runner application and other tools preinstalled, and is available with Ubuntu Linux, Windows, or macOS operating systems. When you use a {% data variables.product.prodname_dotcom %}-hosted runner, machine maintenance and upgrades are taken care of for you.
 
+{% ifversion github-hosted-runners-emus-entitlements %}
+
+{% note %}
+
+**Note:** {% data reusables.actions.entitlement-minutes-emus %} For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users)."
+
+{% endnote %}
+
+{% endif %}
+
 {% ifversion not ghes %}
 
 ## Using a {% data variables.product.prodname_dotcom %}-hosted runner

diff --git a/...gement/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md b/...gement/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md
@@ -108,6 +108,7 @@ To discover how a member was added to an organization, you can filter the member
   - Can create codespaces for repositories owned by their organization, or forks of these repositories, provided that the organization can pay for {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)."
   - Cannot create codespaces for their personal repositories, other than forks of repositories owned by their organization; for any other repositories outside their organization; or from {% data variables.product.company_short %}'s public templates for {% data variables.product.prodname_github_codespaces %}.
   - Cannot publish a codespace created from a template to a new repository.
+- {% data reusables.actions.entitlement-minutes-emus %}
 
 ## Getting started with {% data variables.product.prodname_emus %}
 

diff --git a/data/features/github-hosted-runners-emus-entitlements.yml b/data/features/github-hosted-runners-emus-entitlements.yml
@@ -0,0 +1,4 @@
+# Issue 11808, "Rolling back entitlement change for Actions Minutes and EMUs"
+
+versions:
+  ghec: '*'
diff --git a/data/reusables/actions/entitlement-minutes-emus.md b/data/reusables/actions/entitlement-minutes-emus.md
@@ -0,0 +1 @@
+Entitlement minutes for {% data variables.product.company_short %}-hosted runners are not available for {% data variables.enterprise.prodname_managed_users %}. {% data variables.product.prodname_emus %} who would like to contribute to repositories in organizations they are not a member of can fork the organization repo, then open a pull request targeting the organization repository. This runs the workflows on the organization's {% data variables.product.company_short %}-hosted runners.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Entitlement minutes for {% data variables.product.company_short %}-hosted runners are not available for {% data variables.enterprise.prodname_managed_users %}. {% data variables.product.prodname_emus %} who would like to contribute to repositories in organizations they are not a member of can fork the organization repo, then open a pull request targeting the organization repository. This runs the workflows on the organization's {% data variables.product.company_short %}-hosted runners.