Skip to content

Commit ad53eba

Browse files
authored
Merge pull request #19219 from github/repo-sync
repo sync
2 parents 519243c + 8831aa7 commit ad53eba

File tree

27 files changed

+894
-638
lines changed

27 files changed

+894
-638
lines changed

content/admin/configuration/configuring-your-enterprise/initializing-github-ae.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ topics:
88
- Enterprise
99
redirect_from:
1010
- /admin/configuration/initializing-github-ae
11+
- /enterprise-server@latest/admin/configuration/configuring-your-enterprise/initializing-github-ae
1112
---
1213
## About initialization
1314

content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ redirect_from:
1313
- /admin/policies/enforcing-policies-for-your-enterprise/enforcing-github-actions-policies-for-your-enterprise
1414
- /github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account
1515
- /github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account
16+
- /github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account
1617
versions:
1718
ghec: '*'
1819
ghes: '*'

content/admin/policies/enforcing-policies-for-your-enterprise/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ children:
2424
- /enforcing-policies-for-advanced-security-in-your-enterprise
2525
shortTitle: Enforce policies
2626
---
27-

content/admin/policies/index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ intro: 'You can set policies in {% data variables.product.product_name %} to red
44
redirect_from:
55
- /enterprise/admin/developer-workflow
66
- /enterprise/admin/policies
7-
- /github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account
87
versions:
98
ghec: '*'
109
ghes: '*'
@@ -16,4 +15,3 @@ children:
1615
- /enforcing-policy-with-pre-receive-hooks
1716
shortTitle: Set policies
1817
---
19-

content/admin/user-management/managing-organizations-in-your-enterprise/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ redirect_from:
99
- /github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account
1010
- /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account
1111
- /admin/user-management/managing-organizations-in-your-enterprise/managing-unowned-organizations-in-your-enterprise
12+
- /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
13+
- /github/setting-up-and-managing-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
14+
- /github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account
1215
intro: 'Organizations are great for creating distinct groups of users within your company, such as divisions or groups working on similar projects. {% ifversion ghae %}Internal{% else %}Public and internal{% endif %} repositories that belong to an organization are accessible to members of other organizations in the enterprise, while private repositories are inaccessible to anyone but members of the organization that are granted access.'
1316
versions:
1417
ghec: '*'
@@ -31,4 +34,3 @@ children:
3134
- /continuous-integration-using-jenkins
3235
shortTitle: Manage organizations
3336
---
34-

content/rest/overview/resources-in-the-rest-api.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,4 +699,3 @@ If no `Time-Zone` header is specified and you make an authenticated call to the
699699
If the steps above don't result in any information, we use UTC as the timezone to create the git commit.
700700
701701
[pagination-guide]: /guides/traversing-with-pagination
702-

content/support/learning-about-github-support/about-github-support.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ redirect_from:
1717
- /github/working-with-github-support/github-enterprise-cloud-support
1818
- /articles/business-plan-support
1919
- /articles/github-business-cloud-support
20+
- /admin/enterprise-support/about-support-for-advanced-security
21+
- /enterprise-server/admin/enterprise-support/about-support-for-advanced-security
2022
topics:
2123
- Support
2224
---

contributing/redirects.md

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,34 @@ Within docs.github.com, you can redirect from one file to another or from one ve
1010

1111
Sometimes we change the name of an article but want its old URL to redirect to its new URL. For these types of redirects, we use `redirect_from` frontmatter. See [/content#redirect_from](/content#redirect_from) for details.
1212

13+
### Automatic redirects for URLs that do not include a version
14+
15+
If a URL for a docs page is entered without a version segment (e.g., `https://docs.github.com/foo` instead of `https://docs.github.com/<version>/foo`), the site will automatically redirect it to the **first available version** of the page. The order of precedence is specified in `lib/all-versions.js`, where the current order is:
16+
17+
1. Free, Pro, & Team (`fpt`)
18+
1. Enterprise Cloud (`ghec`)
19+
1. Enterprise Server (`ghes`)
20+
1. GitHub AE (`ghae`)
21+
22+
So if a page `foo.md` is only available in Cloud and Server, the link `https://docs.github.com/foo` will automatically redirect to `https://docs.github.com/enterprise-cloud@latest/foo` because Cloud has precedence over Server.
23+
24+
If `foo.md` is available in Free, Pro, & Team, no redirect will occur because `fpt` pages do not have a version segment, so the `fpt` content at `https://docs.github.com/foo` will render.
25+
1326
### Redirects across versions
1427

15-
If you want the URL for one version of an article to redirect to the URL for another version, you must use [/lib/redirects/static/redirect-exceptions.txt](/lib/redirects/static/redirect-exceptions.txt) instead. For example, if you remove the Free, Pro, & Team (`fpt`) version of an article, to prevent 404s, the URL for the `fpt` version should redirect to a version of the article that still exists.
28+
If you want the URL for one version of an article to redirect to a URL for another version, you must use [/lib/redirects/static/redirect-exceptions.txt](/lib/redirects/static/redirect-exceptions.txt) instead. For example, if you remove the Free, Pro, & Team (`fpt`) version of an article, the URL will [automatically redirect](#automatic-redirects-for-urls-that-do-not-include-a-version) to the next available version of the page. If you want it to redirect to a version that is **lower in the order of precedence**, or to a different page entirely, you must specify an exception.
29+
30+
Another example: we removed the `ghes` version of "[Exporting member information for your organization](https://docs.github.com/en/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization)," but we don't want URLs that include the `enterprise-server@<release>` version segment to 404. In order to redirect `ghes` URLs to another version (such as `ghec`), we need to add an exception.
1631

17-
Each entry in this file should start with the path you want to redirect _to_, including the version, followed by an unordered list of the paths you want to redirect _from_. For example, if you removed the `fpt` version of "[Cloning a repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository)", you would redirect folks who attempt to access that path to the `ghec` version with the following entry.
32+
Each entry in [the exceptions file](/lib/redirects/static/redirect-exceptions.txt) should start with the path you want to redirect _to_, including the version, followed by an unordered list of the paths you want to redirect _from_:
1833

1934
```
20-
/enterprise-cloud@latest/repositories/creating-and-managing-repositories/cloning-a-repository
21-
- /articles/cloning-a-repository
22-
- /articles/cloning-a-repository-from-github
23-
- /github/creating-cloning-and-archiving-repositories/cloning-a-repository
24-
- /github/creating-cloning-and-archiving-repositories/cloning-a-repository-from-github/cloning-a-repository
25-
- /repositories/creating-and-managing-repositories/cloning-a-repository
35+
/enterprise-cloud@latest/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization
36+
- /[email protected]/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization
37+
- /[email protected]/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization
38+
- /[email protected]/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization
2639
```
2740

28-
Note that you must add redirects for both the current `fpt` path and any previous `fpt` paths.
29-
3041
## External redirects
3142

3243
Sometimes the canonical home of some content moves outside the help site. For these types of redirects, we add entries to [/lib/redirects/external-sites.json](/lib/redirects/external-sites.json).

data/graphql/ghec/schema.docs.graphql

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25330,6 +25330,11 @@ type Organization implements Actor & MemberStatusable & Node & PackageOwner & Pr
2533025330
Events involving this sponsorable, such as new sponsorships.
2533125331
"""
2533225332
sponsorsActivities(
25333+
"""
25334+
Filter activities to only the specified actions.
25335+
"""
25336+
actions: [SponsorsActivityAction!] = []
25337+
2533325338
"""
2533425339
Returns the elements in the list that come after the specified cursor.
2533525340
"""
@@ -25356,7 +25361,8 @@ type Organization implements Actor & MemberStatusable & Node & PackageOwner & Pr
2535625361
orderBy: SponsorsActivityOrder = {field: TIMESTAMP, direction: DESC}
2535725362

2535825363
"""
25359-
Filter activities returned to only those that occurred in a given time range.
25364+
Filter activities returned to only those that occurred in the most recent
25365+
specified time period. Set to ALL to avoid filtering by when the activity occurred.
2536025366
"""
2536125367
period: SponsorsActivityPeriod = MONTH
2536225368
): SponsorsActivityConnection!
@@ -29814,6 +29820,16 @@ type ProjectV2Item implements Node {
2981429820
"""
2981529821
databaseId: Int
2981629822

29823+
"""
29824+
A specific field value given a field name
29825+
"""
29826+
fieldValueByName(
29827+
"""
29828+
The name of the field to return the field value of
29829+
"""
29830+
name: String!
29831+
): ProjectV2ItemFieldValue
29832+
2981729833
"""
2981829834
List of field values
2981929835
"""
@@ -43671,6 +43687,11 @@ interface Sponsorable {
4367143687
Events involving this sponsorable, such as new sponsorships.
4367243688
"""
4367343689
sponsorsActivities(
43690+
"""
43691+
Filter activities to only the specified actions.
43692+
"""
43693+
actions: [SponsorsActivityAction!] = []
43694+
4367443695
"""
4367543696
Returns the elements in the list that come after the specified cursor.
4367643697
"""
@@ -43697,7 +43718,8 @@ interface Sponsorable {
4369743718
orderBy: SponsorsActivityOrder = {field: TIMESTAMP, direction: DESC}
4369843719

4369943720
"""
43700-
Filter activities returned to only those that occurred in a given time range.
43721+
Filter activities returned to only those that occurred in the most recent
43722+
specified time period. Set to ALL to avoid filtering by when the activity occurred.
4370143723
"""
4370243724
period: SponsorsActivityPeriod = MONTH
4370343725
): SponsorsActivityConnection!
@@ -52049,6 +52071,11 @@ type User implements Actor & Node & PackageOwner & ProfileOwner & ProjectNextOwn
5204952071
Events involving this sponsorable, such as new sponsorships.
5205052072
"""
5205152073
sponsorsActivities(
52074+
"""
52075+
Filter activities to only the specified actions.
52076+
"""
52077+
actions: [SponsorsActivityAction!] = []
52078+
5205252079
"""
5205352080
Returns the elements in the list that come after the specified cursor.
5205452081
"""
@@ -52075,7 +52102,8 @@ type User implements Actor & Node & PackageOwner & ProfileOwner & ProjectNextOwn
5207552102
orderBy: SponsorsActivityOrder = {field: TIMESTAMP, direction: DESC}
5207652103

5207752104
"""
52078-
Filter activities returned to only those that occurred in a given time range.
52105+
Filter activities returned to only those that occurred in the most recent
52106+
specified time period. Set to ALL to avoid filtering by when the activity occurred.
5207952107
"""
5208052108
period: SponsorsActivityPeriod = MONTH
5208152109
): SponsorsActivityConnection!

data/graphql/schema.docs.graphql

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25330,6 +25330,11 @@ type Organization implements Actor & MemberStatusable & Node & PackageOwner & Pr
2533025330
Events involving this sponsorable, such as new sponsorships.
2533125331
"""
2533225332
sponsorsActivities(
25333+
"""
25334+
Filter activities to only the specified actions.
25335+
"""
25336+
actions: [SponsorsActivityAction!] = []
25337+
2533325338
"""
2533425339
Returns the elements in the list that come after the specified cursor.
2533525340
"""
@@ -25356,7 +25361,8 @@ type Organization implements Actor & MemberStatusable & Node & PackageOwner & Pr
2535625361
orderBy: SponsorsActivityOrder = {field: TIMESTAMP, direction: DESC}
2535725362

2535825363
"""
25359-
Filter activities returned to only those that occurred in a given time range.
25364+
Filter activities returned to only those that occurred in the most recent
25365+
specified time period. Set to ALL to avoid filtering by when the activity occurred.
2536025366
"""
2536125367
period: SponsorsActivityPeriod = MONTH
2536225368
): SponsorsActivityConnection!
@@ -29814,6 +29820,16 @@ type ProjectV2Item implements Node {
2981429820
"""
2981529821
databaseId: Int
2981629822

29823+
"""
29824+
A specific field value given a field name
29825+
"""
29826+
fieldValueByName(
29827+
"""
29828+
The name of the field to return the field value of
29829+
"""
29830+
name: String!
29831+
): ProjectV2ItemFieldValue
29832+
2981729833
"""
2981829834
List of field values
2981929835
"""
@@ -43671,6 +43687,11 @@ interface Sponsorable {
4367143687
Events involving this sponsorable, such as new sponsorships.
4367243688
"""
4367343689
sponsorsActivities(
43690+
"""
43691+
Filter activities to only the specified actions.
43692+
"""
43693+
actions: [SponsorsActivityAction!] = []
43694+
4367443695
"""
4367543696
Returns the elements in the list that come after the specified cursor.
4367643697
"""
@@ -43697,7 +43718,8 @@ interface Sponsorable {
4369743718
orderBy: SponsorsActivityOrder = {field: TIMESTAMP, direction: DESC}
4369843719

4369943720
"""
43700-
Filter activities returned to only those that occurred in a given time range.
43721+
Filter activities returned to only those that occurred in the most recent
43722+
specified time period. Set to ALL to avoid filtering by when the activity occurred.
4370143723
"""
4370243724
period: SponsorsActivityPeriod = MONTH
4370343725
): SponsorsActivityConnection!
@@ -52049,6 +52071,11 @@ type User implements Actor & Node & PackageOwner & ProfileOwner & ProjectNextOwn
5204952071
Events involving this sponsorable, such as new sponsorships.
5205052072
"""
5205152073
sponsorsActivities(
52074+
"""
52075+
Filter activities to only the specified actions.
52076+
"""
52077+
actions: [SponsorsActivityAction!] = []
52078+
5205252079
"""
5205352080
Returns the elements in the list that come after the specified cursor.
5205452081
"""
@@ -52075,7 +52102,8 @@ type User implements Actor & Node & PackageOwner & ProfileOwner & ProjectNextOwn
5207552102
orderBy: SponsorsActivityOrder = {field: TIMESTAMP, direction: DESC}
5207652103

5207752104
"""
52078-
Filter activities returned to only those that occurred in a given time range.
52105+
Filter activities returned to only those that occurred in the most recent
52106+
specified time period. Set to ALL to avoid filtering by when the activity occurred.
5207952107
"""
5208052108
period: SponsorsActivityPeriod = MONTH
5208152109
): SponsorsActivityConnection!

0 commit comments

Comments
 (0)