diff --git a/lib/enterprise-server-releases.js b/lib/enterprise-server-releases.js
index d7c0ae899e..3c6cbf838e 100644
--- a/lib/enterprise-server-releases.js
+++ b/lib/enterprise-server-releases.js
@@ -59,6 +59,11 @@ const deprecatedReleasesWithLegacyFormat = deprecated.filter(version => versionS
const deprecatedReleasesWithNewFormat = deprecated.filter(version => versionSatisfiesRange(version, '>2.18'))
const deprecatedReleasesOnDeveloperSite = deprecated.filter(version => versionSatisfiesRange(version, '<=2.16'))
const firstReleaseNote = '2.20'
+const firstRestoredAdminGuides = '2.21'
+
+const findReleaseNumberIndex = (releaseNum) => { return all.findIndex(i => i === releaseNum) }
+const getNextReleaseNumber = (releaseNum) => { return all[findReleaseNumberIndex(releaseNum) - 1] }
+const getPreviousReleaseNumber = (releaseNum) => { return all[findReleaseNumberIndex(releaseNum) + 1] }
module.exports = {
next,
@@ -78,5 +83,8 @@ module.exports = {
deprecatedReleasesWithLegacyFormat,
deprecatedReleasesWithNewFormat,
deprecatedReleasesOnDeveloperSite,
- firstReleaseNote
+ firstReleaseNote,
+ firstRestoredAdminGuides,
+ getNextReleaseNumber,
+ getPreviousReleaseNumber
}
diff --git a/lib/redirects/get-old-paths-from-permalink.js b/lib/redirects/get-old-paths-from-permalink.js
index d488b5292b..5c3615a9d5 100644
--- a/lib/redirects/get-old-paths-from-permalink.js
+++ b/lib/redirects/get-old-paths-from-permalink.js
@@ -1,4 +1,4 @@
-const { latest, deprecated, lastReleaseWithLegacyFormat } = require('../enterprise-server-releases')
+const { latest, deprecated, lastReleaseWithLegacyFormat, firstRestoredAdminGuides } = require('../enterprise-server-releases')
const { getPathWithoutLanguage, getPathWithLanguage, getVersionStringFromPath } = require('../path-utils')
const patterns = require('../patterns')
const versionSatisfiesRange = require('../version-satisfies-range')
@@ -29,11 +29,18 @@ module.exports = function getOldPathsFromPath (currentPath, languageCode, curren
.replace(`/${languageCode}/enterprise/${latest}/user/insights`, '/insights'))
// create old path /desktop/guides from current path /desktop
- // create old path /admin/guides from current path /admin
- if (!currentPath.includes('/guides')) {
+ if (currentPath.includes('/desktop') && !currentPath.includes('/guides')) {
oldPaths.add(currentPath
- .replace('/desktop', '/desktop/guides')
- .replace('/admin', '/admin/guides'))
+ .replace('/desktop', '/desktop/guides'))
+ }
+
+ // create old path /admin/guides from current path /admin
+ if (currentPath.includes('admin') && !currentPath.includes('/guides')) {
+ // ... but ONLY on versions <2.21 and in deep links on all versions
+ if (versionSatisfiesRange(currentVersion, `<${firstRestoredAdminGuides}`) || !currentPath.endsWith('/admin')) {
+ oldPaths.add(currentPath
+ .replace('/admin', '/admin/guides'))
+ }
}
// create old path /user from current path /user/github on 2.16+ only
diff --git a/middleware/contextualizers/enterprise-release-notes.js b/middleware/contextualizers/enterprise-release-notes.js
index 1a75370f22..94e00e4cbf 100644
--- a/middleware/contextualizers/enterprise-release-notes.js
+++ b/middleware/contextualizers/enterprise-release-notes.js
@@ -76,7 +76,7 @@ async function renderPatchNotes (patch, ctx) {
module.exports = async function enterpriseReleaseNotesContext (req, res, next) {
// The `/release-notes` sub-path
- if (!req.path.endsWith('/release-notes')) return next()
+ if (!(req.path.endsWith('/release-notes') || req.path.endsWith('/admin'))) return next()
// ignore paths that don't have an enterprise version number
if (!patterns.getEnterpriseServerNumber.test(req.path)) return next()
@@ -106,7 +106,11 @@ module.exports = async function enterpriseReleaseNotesContext (req, res, next) {
const release = req.context.site.data['release-notes'][version.replace(/\./g, '-')]
if (!release) return ret
const patches = sortPatchKeys(release, version)
- return { ...ret, patches }
+
+ const firstPreviousRelease = all[all.findIndex(v => v === version) + 1]
+ const secondPreviousRelease = all[all.findIndex(v => v === firstPreviousRelease) + 1]
+
+ return { ...ret, patches, firstPreviousRelease, secondPreviousRelease }
})
const releaseIndex = supported.findIndex(release => release === requestedVersion)
diff --git a/middleware/contextualizers/whats-new-changelog.js b/middleware/contextualizers/whats-new-changelog.js
index e17676d923..1248d3699b 100644
--- a/middleware/contextualizers/whats-new-changelog.js
+++ b/middleware/contextualizers/whats-new-changelog.js
@@ -3,9 +3,14 @@ const { getRssFeed, getChangelogItems } = require('../../lib/changelog')
module.exports = async function whatsNewChangelog (req, res, next) {
if (!req.context.page) return next()
if (!req.context.page.changelog) return next()
- req.context.changelogUrl = req.context.page.changelog.label === 'education'
- ? 'https://github.blog/category/community/education'
- : `https://github.blog/changelog/label/${req.context.page.changelog.label}`
+ const label = req.context.page.changelog.label
+
+ const labelUrls = {
+ education: 'https://github.blog/category/community/education',
+ enterprise: 'https://github.blog/category/enterprise/'
+ }
+
+ req.context.changelogUrl = labelUrls[label] || `https://github.blog/changelog/label/${label}`
const feed = await getRssFeed(req.context.changelogUrl)
req.context.whatsNewChangelog = await getChangelogItems(req.context.page.changelog.prefix, feed)
diff --git a/package-lock.json b/package-lock.json
index 1e13e20619..2038ffd9a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18724,7 +18724,7 @@
},
"picomatch": {
"version": "2.2.3",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+ "resolved": "",
"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="
},
"pify": {
diff --git a/tests/rendering/header.js b/tests/rendering/header.js
index bb11056880..c381ccf311 100644
--- a/tests/rendering/header.js
+++ b/tests/rendering/header.js
@@ -74,7 +74,7 @@ describe('header', () => {
const ghe = $(`#homepages a[href="/en/enterprise-server@${latest}/admin"]`)
expect(ghe.length).toBe(1)
- expect(ghe.text().trim()).toBe('Enterprise Administrators')
+ expect(ghe.text().trim()).toBe('GitHub Enterprise')
expect(ghe.attr('class').includes('active')).toBe(false)
})
diff --git a/tests/rendering/server.js b/tests/rendering/server.js
index 249730fba9..d03ac9c728 100644
--- a/tests/rendering/server.js
+++ b/tests/rendering/server.js
@@ -518,8 +518,8 @@ describe('GitHub Enterprise URLs', () => {
test('renders the Enterprise Admin category homepage', async () => {
const adminPath = `/en/enterprise-server@${enterpriseServerReleases.latest}/admin`
const $ = await getDOM(adminPath)
- expect($(`article a[href="${adminPath}/installation"]`).length).toBe(1)
- expect($.text()).toContain('This guide describes')
+ expect($(`h3 ~ a[href="${adminPath}/guides"]`).length).toBe(1)
+ expect($('h2 a[href="#all-docs"]').length).toBe(1)
})
test('renders an Enterprise Admin category with correct links', async () => {
diff --git a/tests/rendering/sidebar.js b/tests/rendering/sidebar.js
index 9157773d73..2e66798a1a 100644
--- a/tests/rendering/sidebar.js
+++ b/tests/rendering/sidebar.js
@@ -15,7 +15,7 @@ describe('sidebar', () => {
test('highlights active product on Enterprise pages', async () => {
expect($enterprisePage('.sidebar li.sidebar-product').length).toBe(1)
- expect($enterprisePage('.sidebar li.sidebar-product > a').text().trim()).toBe('Enterprise Administrators')
+ expect($enterprisePage('.sidebar li.sidebar-product > a').text().trim()).toBe('GitHub Enterprise')
})
test('highlights active product on GitHub pages', async () => {
diff --git a/tests/routing/redirects.js b/tests/routing/redirects.js
index 0bb7eb1586..8064dfe669 100644
--- a/tests/routing/redirects.js
+++ b/tests/routing/redirects.js
@@ -6,6 +6,7 @@ const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
const Page = require('../../lib/page')
const { get } = require('../helpers/supertest')
+const versionSatisfiesRange = require('../../lib/version-satisfies-range')
describe('redirects', () => {
jest.setTimeout(5 * 60 * 1000)
@@ -195,11 +196,16 @@ describe('redirects', () => {
})
describe('enterprise admin', () => {
- const enterpriseAdmin = `/en/enterprise-server@${enterpriseServerReleases.latest}/admin`
+ // firstRestoredAdminGuides = 2.21
+ // lastBeforeRestoredAdminGuides = 2.20
+ // (these won't change but it's more convenient to use constants)
+ const { firstRestoredAdminGuides, getPreviousReleaseNumber, latest } = enterpriseServerReleases
+ const lastBeforeRestoredAdminGuides = getPreviousReleaseNumber(firstRestoredAdminGuides)
+ const enterpriseAdmin = `/en/enterprise-server@${latest}/admin`
const japaneseEnterpriseAdmin = enterpriseAdmin.replace('/en/', '/ja/')
test('no language code redirects to english', async () => {
- const res = await get(`/enterprise/${enterpriseServerReleases.latest}/admin`)
+ const res = await get(`/enterprise/${latest}/admin`)
expect(res.statusCode).toBe(301)
expect(res.headers.location).toBe(enterpriseAdmin)
})
@@ -210,24 +216,39 @@ describe('redirects', () => {
expect(res.headers.location).toBe(enterpriseAdmin)
})
- test('admin/guides redirects to admin', async () => {
- const res = await get(`/en/enterprise/${enterpriseServerReleases.latest}/admin/guides`)
+ test('admin/guides redirects to admin on <2.21', async () => {
+ const res = await get(`/en/enterprise-server@${lastBeforeRestoredAdminGuides}/admin/guides`)
expect(res.statusCode).toBe(301)
- expect(res.headers.location).toBe(enterpriseAdmin)
+ expect(res.headers.location).toBe(enterpriseAdmin.replace(latest, lastBeforeRestoredAdminGuides))
})
- test('no version plus admin/guides redirects to admin on latest version', async () => {
- const res = await get('/en/enterprise/admin/guides')
- expect(res.statusCode).toBe(301)
- expect(res.headers.location).toBe(enterpriseAdmin)
+ test('admin/guides does not redirect to admin on >=2.21', async () => {
+ const res = await get(`/en/enterprise-server@${firstRestoredAdminGuides}/admin/guides`)
+ expect(res.statusCode).toBe(200)
})
- test('admin/guides redirects to admin in redirects', async () => {
- const res = await get(`/en/enterprise/${enterpriseServerReleases.latest}/admin/guides/installation/upgrading-github-enterprise`)
+ test('no version plus admin/guides redirects to the right place on latest version', async () => {
+ const shouldRedirect = versionSatisfiesRange(latest, `<${firstRestoredAdminGuides}`)
+ const expectedStatusCode = shouldRedirect ? 301 : 200
+ const res = await get(`/en/enterprise-server@${latest}/admin/guides`)
+ expect(res.statusCode).toBe(expectedStatusCode)
+ })
+
+ test('admin/guides redirects to admin in deep links on <2.21', async () => {
+ const res = await get(`/en/enterprise-server@${lastBeforeRestoredAdminGuides}/admin/guides/installation/upgrading-github-enterprise`)
expect(res.statusCode).toBe(301)
const redirectRes = await get(res.headers.location)
expect(redirectRes.statusCode).toBe(200)
- const expected = `/en/enterprise-server@${enterpriseServerReleases.latest}/admin/enterprise-management/upgrading-github-enterprise-server`
+ const expected = `/en/enterprise-server@${lastBeforeRestoredAdminGuides}/admin/enterprise-management/upgrading-github-enterprise-server`
+ expect(res.headers.location).toBe(expected)
+ })
+
+ test('admin/guides still redirects to admin in deep links on >=2.21', async () => {
+ const res = await get(`/en/enterprise-server@${firstRestoredAdminGuides}/admin/guides/installation/upgrading-github-enterprise`)
+ expect(res.statusCode).toBe(301)
+ const redirectRes = await get(res.headers.location)
+ expect(redirectRes.statusCode).toBe(200)
+ const expected = `/en/enterprise-server@${firstRestoredAdminGuides}/admin/enterprise-management/upgrading-github-enterprise-server`
expect(res.headers.location).toBe(expected)
})
@@ -237,10 +258,15 @@ describe('redirects', () => {
expect(res.headers.location).toBe(japaneseEnterpriseAdmin)
})
- test('admin/guides redirects to admin (japanese)', async () => {
- const res = await get(`/ja/enterprise/${enterpriseServerReleases.latest}/admin/guides`)
+ test('admin/guides redirects to admin on <2.21 (japanese)', async () => {
+ const res = await get(`/ja/enterprise-server@${lastBeforeRestoredAdminGuides}/admin/guides`)
expect(res.statusCode).toBe(301)
- expect(res.headers.location).toBe(japaneseEnterpriseAdmin)
+ expect(res.headers.location).toBe(japaneseEnterpriseAdmin.replace(latest, lastBeforeRestoredAdminGuides))
+ })
+
+ test('admin/guides does not redirect to admin on >=2.21 (japanese)', async () => {
+ const res = await get(`/ja/enterprise-server@${firstRestoredAdminGuides}/admin/guides`)
+ expect(res.statusCode).toBe(200)
})
})
diff --git a/tests/unit/products.js b/tests/unit/products.js
index ad7b51eb98..a84f3c2ebc 100644
--- a/tests/unit/products.js
+++ b/tests/unit/products.js
@@ -27,7 +27,7 @@ describe('mobile-only products nav', () => {
expect((await getDOM('/github'))('#current-product').text().trim()).toBe('GitHub.com')
// Enterprise server
- expect((await getDOM('/en/enterprise/admin'))('#current-product').text().trim()).toBe('Enterprise Administrators')
+ expect((await getDOM('/en/enterprise/admin'))('#current-product').text().trim()).toBe('GitHub Enterprise')
expect((await getDOM('/en/enterprise/user/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address'))('#current-product').text().trim()).toBe('GitHub.com')
expect((await getDOM('/desktop'))('#current-product').text().trim()).toBe('GitHub Desktop')