Skip to content

Commit d29b1d7

Browse files
mattpollardmattpollard
authored
Merge branch 'main' into clarify_locking_behaviour_migration
2 parents 3f6554f + a2daa6c commit d29b1d7

File tree

122 files changed

+5174
-4786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+5174
-4786
lines changed

‎components/product/SidebarProduct.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const SidebarProduct = () => {
3939
const isStandaloneCategory = childPage.page.documentType === 'article'
4040

4141
const childTitle = childPage.renderedShortTitle || childPage.renderedFullTitle
42-
const isActive = routePath.includes(routePath)
42+
const isActive = routePath.includes(childPage.href)
4343
const isCurrent = routePath === childPage.href
4444
return (
4545
<li

‎content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ topics:
2020

2121
Subdomain isolation mitigates cross-site scripting and other related vulnerabilities. For more information, see "[Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting)" on Wikipedia. We highly recommend that you enable subdomain isolation on {% data variables.product.product_location %}.
2222

23-
When subdomain isolation is enabled, {% data variables.product.prodname_ghe_server %} replaces several paths with subdomains.
23+
When subdomain isolation is enabled, {% data variables.product.prodname_ghe_server %} replaces several paths with subdomains. After enabling subdomain isolation, attempts to access the previous paths for some user-supplied content, such as `http(s)://HOSTNAME/raw/`, may return `404` errors.
2424

2525
{% if currentVersion == "enterprise-server@2.22" %}
2626
To use Docker with {% data variables.product.prodname_registry %}, you must also enable subdomain isolation. For more information, see "[Working with the Docker registry](/enterprise/{{ currentVersion }}/user/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)."

‎content/admin/index.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ featuredLinks:
2222
- '{% if currentVersion == "github-ae@latest" %}/admin/user-management/customizing-user-messages-for-your-enterprise{% endif %}'
2323
- '{% if currentVersion == "github-ae@latest" %}/admin/github-actions/getting-started-with-github-actions-for-github-ae{% endif %}'
2424
popular:
25-
- '{% if currentVersion == "github-ae@latest" %}/admin/overview/github-ae-release-notes{% endif %}'
25+
- '{% if currentVersion == "github-ae@latest" %}/admin/release-notes{% endif %}'
2626
- '{% if enterpriseServerVersions contains currentVersion %}/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server{% endif %}'
2727
- '{% if enterpriseServerVersions contains currentVersion %}/admin/installation{% endif %}'
2828
- '{% if currentVersion == "github-ae@latest" %}/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad{% endif %}'
@@ -50,14 +50,3 @@ children:
5050
- /release-notes
5151
- /all-releases
5252
---
53-
<!-- . -->
54-
<!-- . -->
55-
<!-- . -->
56-
<!-- . -->
57-
<!-- . -->
58-
<!-- . -->
59-
<!-- . -->
60-
<!-- . -->
61-
<!-- . -->
62-
<!-- . -->
63-
<!-- . -->

‎content/admin/overview/about-upgrades-to-new-releases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ To upgrade your enterprise to a new release, see "[Release notes](/enterprise-se
4545

4646
- [ {% data variables.product.prodname_roadmap %} ]( {% data variables.product.prodname_roadmap_link %} ) in the `github/roadmap` repository
4747
{% if currentVersion == "github-ae@latest" %}
48-
- [ {% data variables.product.prodname_ghe_managed %} release notes](/admin/overview/github-ae-release-notes)
48+
- [ {% data variables.product.prodname_ghe_managed %} release notes](/admin/release-notes)
4949
{% endif %}

‎content/admin/overview/github-ae-release-notes.md

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎content/admin/overview/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ versions:
88
github-ae: '*'
99
children:
1010
- /about-github-ae
11+
- /about-upgrades-to-new-releases
1112
- /about-data-residency
1213
- /about-enterprise-accounts
1314
- /managing-your-github-enterprise-license
1415
- /managing-billing-for-your-enterprise
1516
- /about-upgrades-to-new-releases
1617
- /system-overview
1718
- /about-the-github-enterprise-api
18-
- /github-ae-release-notes
1919
---
2020
For more information, or to purchase {% data variables.product.prodname_enterprise %}, see [{% data variables.product.prodname_enterprise %}](https://github.com/enterprise).

‎content/admin/release-notes.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
title: Release notes
3-
intro: 'The release notes for {{ allVersions[currentVersion].versionTitle }}.'
43
layout: release-notes
54
versions:
65
enterprise-server: '*'
6+
github-ae: '*'
77
topics:
88
- Enterprise
99
- Upgrades
10+
redirect_from:
11+
- /admin/overview/github-ae-release-notes
1012
---
11-

‎content/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ intro: 'If you want to use {% data variables.product.prodname_GH_advanced_securi
44
product: '{% data reusables.gated-features.ghas %}'
55
redirect_from:
66
- /github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security
7+
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security
78
versions:
89
free-pro-team: '*'
910
type: overview

‎content/billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ intro: 'You can view usage of your {% data variables.product.prodname_GH_advance
44
permissions: 'Enterprise owners can manage access to {% data variables.product.prodname_GH_advanced_security %} for their organization or enterprise organizations.'
55
product: '{% data reusables.gated-features.ghas %}'
66
redirect_from:
7+
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage
78
- /github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account
89
- /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage
910
versions:

0 commit comments

Comments
 (0)