Skip to content

Commit 6d28aa5

Browse files
authored
Merge pull request github#16660 from github/repo-sync
repo sync
2 parents 9e7cc52 + bcddc37 commit 6d28aa5

File tree

12 files changed

+17
-22
lines changed

12 files changed

+17
-22
lines changed

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ versions:
1515
topics:
1616
- Notifications
1717
---
18-
{% ifversion ghes %}
19-
{% data reusables.mobile.ghes-release-phase %}
20-
{% endif %}
2118

2219
## Notifications and subscriptions
2320

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ versions:
2323
topics:
2424
- Notifications
2525
---
26-
{% ifversion ghes %}
27-
{% data reusables.mobile.ghes-release-phase %}
28-
{% endif %}
2926

3027
## Notification delivery options
3128

content/account-and-profile/managing-subscriptions-and-notifications-on-github/viewing-and-triaging-notifications/managing-notifications-from-your-inbox.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ topics:
1515
- Notifications
1616
shortTitle: Manage from your inbox
1717
---
18-
{% ifversion ghes %}
19-
{% data reusables.mobile.ghes-release-phase %}
20-
{% endif %}
2118

2219
## About your inbox
2320

content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ redirect_from:
1313
- /admin/configuration/managing-github-for-mobile-for-your-enterprise
1414
shortTitle: Manage GitHub Mobile
1515
---
16-
{% ifversion ghes %}
17-
{% data reusables.mobile.ghes-release-phase %}
18-
{% endif %}
1916

2017
## About {% data variables.product.prodname_mobile %}
2118

content/get-started/using-github/github-mobile.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ redirect_from:
1212
- /github/getting-started-with-github/github-for-mobile
1313
- /github/getting-started-with-github/using-github/github-for-mobile
1414
---
15-
{% data reusables.mobile.ghes-release-phase %}
1615

1716
## About {% data variables.product.prodname_mobile %}
1817

content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ To perform any actions on {% data variables.product.product_name %}, such as cre
2020

2121
Within an organization, you can assign roles at the organization, team, and repository level. For more information about the different levels of roles, see "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)."
2222

23-
If your organization uses {% data variables.product.prodname_ghe_cloud %}, you can have more granular control over the permissions you grant at the repository level by creating up to three custom repository roles. A custom repository role is a configurable set of permissions with a custom name you choose. After you create a custom role, anyone with admin access to a repository can assign the role to an individual or team. For more information, see "[Managing an individual's access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository)" and "[Managing team access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)"
24-
25-
{% data reusables.enterprise.link-to-ghec-trial %}
23+
You can have more granular control over the permissions you grant at the repository level by creating up to three custom repository roles. A custom repository role is a configurable set of permissions with a custom name you choose. After you create a custom role, anyone with admin access to a repository can assign the role to an individual or team. For more information, see "[Managing an individual's access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository)" and "[Managing team access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)"
2624

2725
## About the inherited role
2826

@@ -112,6 +110,14 @@ To resolve conflicting access, you can adjust your organization's base permissio
112110

113111
To create a new repository role, you add permissions to an inherited role and give the custom role a name.
114112

113+
{% ifversion ghec %}
114+
{% note %}
115+
116+
**Note:** Only organizations that use {% data variables.product.prodname_ghe_cloud %} can create custom repository roles. {% data reusables.enterprise.link-to-ghec-trial %}
117+
118+
{% endnote %}
119+
{% endif %}
120+
115121
{% data reusables.profile.access_profile %}
116122
{% data reusables.profile.access_org %}
117123
{% data reusables.organizations.org_settings %}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{% data reusables.actions.actions-spending-limit-brief %}
22

33
If you have an unlimited spending limit or a spending limit set higher than $0 USD, you will be billed for any additional minutes or storage beyond the included amounts in your account, also called overages. {% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where a workflow is run. Any coupons on your account do not apply to {% data variables.product.prodname_actions %} overages.
4+
5+
{% data reusables.billing.overages-billed-monthly %}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Overages are always billed monthly regardless of your billing term (even if your account is otherwise billed annually).

data/reusables/codespaces/codespaces-spending-limit-requirement.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
{% endnote %}
66

77
By default, your organization or enterprise will have a {% data variables.product.prodname_codespaces %} spending limit of $0, which prevents new codespaces from being created or existing codespaces from being opened. To allow your users to create codespaces in your organization, set the limit to a value higher than $0.
8+
9+
{% data reusables.billing.overages-billed-monthly %}

data/reusables/mobile/about-mobile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{% data variables.product.prodname_mobile %} is available as an Android and iOS app. {% data variables.product.prodname_mobile %} is generally available for {% data variables.product.prodname_dotcom_the_website %} users and in public beta for users of {% data variables.product.prodname_ghe_server %} 3.0+.
1+
{% data variables.product.prodname_mobile %} is available as an Android and iOS app.

0 commit comments

Comments
 (0)