From 08d548a9782337f53f1b0d496e7ba037e7884162 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 25 Nov 2020 20:03:49 -0500
Subject: [PATCH 01/40] add new link checking code

---
 tests/helpers/links-checker.js             | 255 +++++++++++++++++++++
 tests/links-and-images/links-and-images.js | 113 ++-------
 2 files changed, 278 insertions(+), 90 deletions(-)
 create mode 100644 tests/helpers/links-checker.js

diff --git a/tests/helpers/links-checker.js b/tests/helpers/links-checker.js
new file mode 100644
index 0000000000..b85e1c47c4
--- /dev/null
+++ b/tests/helpers/links-checker.js
@@ -0,0 +1,255 @@
+const cheerio = require('cheerio')
+const { union, uniq } = require('lodash')
+const fs = require('fs')
+const path = require('path')
+
+const { getVersionStringFromPath } = require('../../lib/path-utils')
+const patterns = require('../../lib/patterns')
+const { deprecated, latest } = require('../../lib/enterprise-server-releases')
+const findPageInVersion = require('../../lib/find-page-in-version')
+const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
+const rest = require('../../middleware/contextualizers/rest')
+const graphql = require('../../middleware/contextualizers/graphql')
+const contextualize = require('../../middleware/context')
+// TODO enable when release notes are live
+// const releaseNotes = require('../../middleware/contextualizers/enterprise-release-notes')
+
+class LinksChecker {
+  constructor (opts = { languageCode: 'en', internalHrefPrefixes: ['/', '#'] }) {
+    Object.assign(this, { ...opts })
+
+    // Some caching mechanism so we do not load pages unnecessarily,
+    // nor check links that have been checked
+    this.pageCache = new Map()
+    this.checkedLinksCache = new Set()
+
+    // stores images to check all at once in a Map:
+    // imageSrc => {
+    //   "usedBy": [version:path, ...]
+    // }
+    this.imagesToCheck = new Map()
+
+    // Stores broken images in a Map, formatted the same way as imagesToCheck
+    this.brokenImages = new Map()
+
+    // Stores broken links in a Map in the format of:
+    //     link => {
+    //       linkedFrom: [ version:filePath, ... ]
+    //     }, ...
+    this.brokenLinks = new Map()
+
+    // stores anchor links to check all at once in a Map:
+    // version:filePath => {
+    //   '#anchor-link' : {
+    //     linkedFrom: ['url1', 'url2']
+    //   },
+    //   '#anchor-link2': {...}
+    // }
+    this.anchorLinksToCheck = new Map()
+
+    // Stores broken anchors in a Map, formatted the same way as anchorLinksToCheck
+    this.brokenAnchors = new Map()
+  }
+
+  async setRenderedPageObj (pathCacheKey, context, reRender = false) {
+    if (this.pageCache.has(pathCacheKey) && !reRender) return
+    let pageHTML = await context.page.render(context)
+
+    // handle special pre-rendered snowflake
+    if (context.page.relativePath.endsWith('graphql/reference/objects.md')) {
+      pageHTML += context.graphql.prerenderedObjectsForCurrentVersion.html
+    }
+
+    const pageObj = cheerio.load(pageHTML, { xmlMode: true })
+    this.pageCache.set(pathCacheKey, pageObj)
+  }
+
+  async getRenderedPageObj (pathCacheKey, context) {
+    if (!this.pageCache.has(pathCacheKey)) {
+      if (context) {
+        await this.setRenderedPageObj(pathCacheKey, context)
+      } else {
+        console.error('cannot find pre-rendered page, and does not have enough context to render one.')
+      }
+    }
+    return this.pageCache.get(pathCacheKey)
+  }
+
+  addAnchorForLater (pagePath, anchor, linkedFrom) {
+    const anchorsInPath = this.anchorLinksToCheck.get(pagePath) || {}
+    const anchorLink = anchorsInPath[anchor] ? anchorsInPath[anchor] : { linkedFrom: [] }
+    anchorLink.linkedFrom = union(anchorLink.linkedFrom, [linkedFrom])
+    anchorsInPath[anchor] = anchorLink
+    this.anchorLinksToCheck.set(pagePath, anchorsInPath)
+  }
+
+  addImagesForLater (images, pagePath) {
+    uniq(images).forEach(imageSrc => {
+      const imageUsage = this.imagesToCheck.get(imageSrc) || { usedBy: [] }
+      imageUsage.usedBy = union(imageUsage.usedBy, [pagePath])
+      this.imagesToCheck.set(imageSrc, imageUsage)
+    })
+  }
+
+  async checkPage (context, checkExternalAnchors) {
+    const path = context.relativePath
+    const version = context.currentVersion
+
+    const pathCacheKey = `${version}:${path}`
+    const $ = await this.getRenderedPageObj(pathCacheKey, context)
+    
+    const imageSrcs = $('img[src^="/assets"]').map((i, el) => $(el).attr('src')).toArray()
+
+    this.addImagesForLater(imageSrcs, pathCacheKey)
+
+    for (const href of this.internalHrefPrefixes) {
+      const internalLinks = $(`a[href^="${href}"]`).get()
+
+      for (const internalLink of internalLinks) {
+        const href = $(internalLink).attr('href')
+
+        let [link, anchor] = href.split('#')
+        // remove trailing slash
+        link = link.replace(patterns.trailingSlash, '$1')
+
+        // if it's an external link and has been checked before, skip
+        if (link && this.checkedLinksCache.has(link)) {
+          // if it's been determined this link is broken, add to the linkedFrom field
+          if (this.brokenLinks.has(link)) {
+            const brokenLink = this.brokenLinks.get(link)
+            brokenLink.linkedFrom = union(brokenLink.linkedFrom, [pathCacheKey])
+            this.brokenLinks.set(link, brokenLink)
+          }
+          if (!anchor) continue
+        }
+
+        // if it's an internal anchor (e.g., #foo), save for later
+        if (anchor && !link) {
+          // ignore anchors that are autogenerated from headings
+          if (anchor === $(internalLink).parent().attr('id')) continue
+          this.addAnchorForLater(pathCacheKey, anchor, 'same page')
+          continue
+        }
+
+        //------ BEGIN ONEOFF EXCLUSIONS -------///
+        // skip GraphQL public schema paths (these are checked by separate tests)
+        if (link.startsWith('/public/') && link.endsWith('.graphql')) continue
+
+        // skip links that start with /assets/images, as these are not in the pages collection
+        // and /assets/images paths should be checked during the image check
+        if (link.startsWith('/assets/images')) continue
+
+        // skip rare hardcoded links to old GHE versions
+        // these paths will always be in the old versioned format
+        // example: /enterprise/11.10.340/admin/articles/upgrading-to-the-latest-release
+        const gheVersionInLink = link.match(patterns.getEnterpriseVersionNumber)
+        if (gheVersionInLink && deprecated.includes(gheVersionInLink[1])) continue
+        //------ END ONEOFF EXCLUSIONS -------///
+
+        // look for linked page
+        const versionFromHref = getVersionStringFromPath(link)
+        const linkedPage = findPageInVersion(link, context.pages, context.redirects, this.languageCode, versionFromHref)
+        this.checkedLinksCache.add(link)
+
+        if (!linkedPage) {
+          this.brokenLinks.set(link, { linkedFrom: [pathCacheKey] })
+          continue
+        }
+        
+        // if we're not checking external anchors, we're done
+        if (!checkExternalAnchors) {
+          continue
+        }
+
+        // find the permalink for the current version
+        const linkedPagePermalink = linkedPage.permalinks.find(permalink => permalink.pageVersion === version)
+
+        if (linkedPagePermalink) {
+          const linkedPageContext = await buildPathContext(context, linkedPage, linkedPagePermalink) 
+
+          if (anchor) {
+            await this.setRenderedPageObj(`${version}:${linkedPage.relativePath}`, linkedPageContext)
+            this.addAnchorForLater(`${version}:${linkedPage.relativePath}`, anchor, pathCacheKey)
+          }
+        }
+      }
+    }
+  }
+
+  async checkAnchors () {
+    for await (const [pathCacheKey, anchors] of this.anchorLinksToCheck) {
+      const $ = await this.getRenderedPageObj(pathCacheKey)
+      for (const anchorText in anchors) {
+        const matchingHeadings = $(`[id="${anchorText}"], [name="${anchorText}"]`)
+        if (matchingHeadings.length === 0) {
+          const brokenAnchorPath = this.brokenAnchors.get(pathCacheKey) || {}
+          brokenAnchorPath[anchorText] = anchors[anchorText]
+          this.brokenAnchors.set(pathCacheKey, brokenAnchorPath)
+        }
+      }
+    }
+  }
+
+  getBrokenLinks () {
+    return this.brokenLinks
+  }
+
+  async getBrokenAnchors () {
+    await this.checkAnchors()
+    return this.brokenAnchors
+  }
+
+  async getBrokenImages () {
+    for await (const [imageSrc, imageUsage] of this.imagesToCheck) {
+      try {
+        await fs.promises.access(path.join(process.cwd(), imageSrc))
+      } catch (e) {
+        this.brokenImages.set(imageSrc, imageUsage)
+      }
+    }
+    return this.brokenImages
+  }
+}
+
+// this function is async because the middleware functions are likely async
+async function applyMiddleware (middleware, req) {
+  return middleware(req, null, () => {})
+}
+
+async function buildInitialContext () {
+  const req = { 
+    path: '/en',
+    language: 'en', 
+    query: {} 
+  }
+  await applyMiddleware(contextualize, req)
+  return req.context
+}
+
+async function buildPathContext (context, page, permalink) {
+  const pathContext = {
+    page,
+    currentVersion: permalink.pageVersion,
+    relativePath: permalink.relativePath
+  } 
+ 
+  const req = { 
+    path: permalink.href,
+    context: Object.assign({}, context, pathContext),
+    language: 'en',
+    query: {} 
+  }
+
+  await applyMiddleware(rest, req)
+  await applyMiddleware(graphql, req)
+  // TODO enable when release notes are live
+  // await applyMiddleware(releaseNotes, req)
+
+  return Object.assign({}, context, req.context)
+}
+
+module.exports = {
+  LinksChecker,
+  buildPathContext,
+  buildInitialContext
+}
\ No newline at end of file
diff --git a/tests/links-and-images/links-and-images.js b/tests/links-and-images/links-and-images.js
index 4eb607f80a..29fae220b9 100644
--- a/tests/links-and-images/links-and-images.js
+++ b/tests/links-and-images/links-and-images.js
@@ -1,113 +1,46 @@
-const cheerio = require('cheerio')
-const loadPages = require('../../lib/pages')
-const loadSiteData = require('../../lib/site-data')
-const getApplicableVersions = require('../../lib/get-applicable-versions')
-const renderContent = require('../../lib/render-content')
-const checkImages = require('../../lib/check-images')
-const checkLinks = require('../../lib/check-links')
-const enterpriseServerVersions = Object.keys(require('../../lib/all-versions'))
-  .filter(version => version.startsWith('enterprise-server@'))
-const flat = require('flat')
-const { last } = require('lodash')
-
-// english only for now
+const { LinksChecker, buildInitialContext, buildPathContext, updateContextPerPath } = require('../helpers/links-checker')
 const languageCode = 'en'
 
-const context = { currentLanguage: languageCode }
-
-const loadRedirects = require('../../lib/redirects/precompile')
+// TODO set to true when we're ready to report and fix broken anchors
+const checkExternalAnchors = false
 
 describe('page rendering', () => {
   jest.setTimeout(1000 * 1000)
 
-  const brokenImages = {}
-  const brokenAnchors = {}
-  const brokenLinks = {}
+  const linksChecker = new LinksChecker()
 
-  let pages, siteData, redirects
   beforeAll(async (done) => {
-    pages = await loadPages()
-    siteData = await loadSiteData()
-    redirects = await loadRedirects(pages)
+    // fetch context.pages, context.redirects, etc.
+    // we only want to build these one time
+    const context = await buildInitialContext()
 
-    context.pages = pages
-    context.site = siteData[languageCode].site
-    context.redirects = redirects
-
-    let checkedLinks = {}
-    let checkedImages = {}
-
-    const englishPages = pages
+    const englishPages = context.pages
       .filter(page => page.languageCode === languageCode)
-      // ignore developers content, to be checked separately
-      .filter(page => !page.relativePath.match(/^(rest|graphql|developers)/))
 
     for (const page of englishPages) {
-      // skip map topics because they have no content of their own
-      if (page.mapTopic) continue
-
-      const brokenImagesPerPage = {}
-      const brokenAnchorsPerPage = {}
-      const brokenLinksPerPage = {}
-
-      // get an array of the pages product versions
-      const pageVersions = getApplicableVersions(page.versions, page.relativePath)
-
-      for (const pageVersion of pageVersions) {
-        // attach page-specific properties to context
-        page.version = pageVersion
-        context.page = page
-        context.currentVersion = pageVersion
-        context.enterpriseServerVersions = enterpriseServerVersions
-
-        // collect elements of the page that may contain links
-        const pageContent = page.intro + page.permissions + page.markdown
-
-        // renderContent is much faster than page.render, even though we later have to run
-        // rewriteLocalLinks in check-images and rewriteAssetPathsToS3 in check-links
-        const pageHtml = await renderContent(pageContent, context)
-        const $ = cheerio.load(pageHtml, { xmlMode: true })
-
-        // check images
-        const { brokenImages: brokenImagesPerVersion, checkedImageCache } = await checkImages($, pageVersion, page.relativePath, checkedImages)
-        if (brokenImagesPerVersion.length) brokenImagesPerPage[pageVersion] = brokenImagesPerVersion
-        checkedImages = checkedImageCache
-
-        // check anchors and links
-        const { brokenLinks: brokenLinksPerVersion, checkedLinkCache } = await checkLinks($, page, context, pageVersion, checkedLinks)
-        if (brokenLinksPerVersion.anchors.length) brokenAnchorsPerPage[pageVersion] = brokenLinksPerVersion.anchors
-        if (brokenLinksPerVersion.links.length) brokenLinksPerPage[pageVersion] = brokenLinksPerVersion.links
-        checkedLinks = checkedLinkCache
+      for (const permalink of page.permalinks) {
+        const pathContext = await buildPathContext(context, page, permalink)
+        await linksChecker.checkPage(pathContext, checkExternalAnchors)
       }
-
-      if (Object.keys(brokenImagesPerPage).length) brokenImages[page.fullPath] = brokenImagesPerPage
-      if (Object.keys(brokenAnchorsPerPage).length) brokenAnchors[page.fullPath] = brokenAnchorsPerPage
-      if (Object.keys(brokenLinksPerPage).length) brokenLinks[page.fullPath] = brokenLinksPerPage
     }
+
     done()
   })
 
   test('every page has image references that can be resolved', async () => {
-    const numbrokenImages = getNumBrokenItems(brokenImages)
-    expect(numbrokenImages, `Found ${numbrokenImages} total broken images: ${JSON.stringify(brokenImages, null, 2)}`).toBe(0)
+    const result = await linksChecker.getBrokenImages()
+    expect(result.size, `Found ${result.size} total broken images: ${JSON.stringify([...result], null, 2)}`).toBe(0)
   })
 
-  test('every page has links with anchors that can be resolved', async () => {
-    const numbrokenAnchors = getNumBrokenItems(brokenAnchors)
-    expect(numbrokenAnchors, `Found ${numbrokenAnchors} total broken anchors: ${JSON.stringify(brokenAnchors, null, 2)}`).toBe(0)
+  // When ready to unskip this, 
+  test.skip('every page has links with anchors that can be resolved', async () => {
+    const result = await linksChecker.getBrokenAnchors()
+    const numBrokenAnchors = [...result].reduce((accumulator, [path, anchors]) => accumulator + Object.keys(anchors).length, 0)
+    expect(numBrokenAnchors, `Found ${numBrokenAnchors} total broken anchors in ${result.size} pages: ${JSON.stringify([...result], null, 2)}`).toBe(0)
   })
 
-  test('every page has links that can be resolved', async () => {
-    const numbrokenLinks = getNumBrokenItems(brokenLinks)
-    expect(numbrokenLinks, `Found ${numbrokenLinks} total broken links: ${JSON.stringify(brokenLinks, null, 2)}`).toBe(0)
+  test('every page has links that can be resolved', () => {
+    const result = linksChecker.getBrokenLinks()
+    expect(result.size, `Found ${result.size} total broken links: ${JSON.stringify([...result], null, 2)}`).toBe(0)
   })
-})
-
-// count all the nested items
-function getNumBrokenItems (items) {
-  // filter for entries like this:
-  // '/article-path-here.md.dotcom.1.broken link': '/en/articles/foo',
-  return Object.keys(flat(items))
-    .filter(key => last(key.split('.')).includes('broken'))
-    .length
-}
+})
\ No newline at end of file

From 7ee7d1ef266bdea82ffc88daea6c48a47e1f4cf7 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 25 Nov 2020 20:04:30 -0500
Subject: [PATCH 02/40] delete no longer needed link checking code

---
 lib/check-images.js                           |  27 ---
 .../developer-links-and-images.js             | 157 ------------------
 2 files changed, 184 deletions(-)
 delete mode 100644 lib/check-images.js
 delete mode 100644 tests/links-and-images/developer-links-and-images.js

diff --git a/lib/check-images.js b/lib/check-images.js
deleted file mode 100644
index 9560437bee..0000000000
--- a/lib/check-images.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const rewriteAssetPathsToS3 = require('./rewrite-asset-paths-to-s3')
-const { promisify } = require('util')
-
-module.exports = async function checkImages ($, version, relativePath, checkedImageCache = {}) {
-  rewriteAssetPathsToS3($, version, relativePath)
-
-  const brokenImages = []
-
-  // this does not check S3 images because those live outside of the repo
-  const images = $('img[src^="/assets"]').get()
-
-  for (const image of images) {
-    const src = $(image).attr('src')
-
-    if (checkedImageCache[src]) continue
-
-    try {
-      await promisify(fs.access)(path.join(__dirname, '..', src))
-    } catch (e) {
-      brokenImages.push({ 'broken image reference': src })
-    }
-  }
-
-  return { brokenImages, checkedImageCache }
-}
diff --git a/tests/links-and-images/developer-links-and-images.js b/tests/links-and-images/developer-links-and-images.js
deleted file mode 100644
index 437cd3c6fd..0000000000
--- a/tests/links-and-images/developer-links-and-images.js
+++ /dev/null
@@ -1,157 +0,0 @@
-const flat = require('flat')
-const { last } = require('lodash')
-const cheerio = require('cheerio')
-const loadPages = require('../../lib/pages')
-const loadSiteData = require('../../lib/site-data')
-const getApplicableVersions = require('../../lib/get-applicable-versions')
-const loadRedirects = require('../../lib/redirects/precompile')
-const { getVersionedPathWithLanguage } = require('../../lib/path-utils')
-const renderContent = require('../../lib/render-content')
-const checkImages = require('../../lib/check-images')
-const checkLinks = require('../../lib/check-developer-links')
-const allVersions = require('../../lib/all-versions')
-const enterpriseServerVersions = Object.keys(require('../../lib/all-versions'))
-  .filter(version => version.startsWith('enterprise-server@'))
-
-// schema-derived data to add to context object
-const rest = require('../../lib/rest')
-const previews = require('../../lib/graphql/static/previews')
-const upcomingChanges = require('../../lib/graphql/static/upcoming-changes')
-const changelog = require('../../lib/graphql/static/changelog')
-const prerenderedObjects = require('../../lib/graphql/static/prerendered-objects')
-
-// english only
-const languageCode = 'en'
-
-const context = {
-  currentLanguage: languageCode,
-  rest
-}
-
-// developer content only
-const developerContentRegex = /^(rest|graphql|developers)/
-
-describe('page rendering', () => {
-  jest.setTimeout(1000 * 1000)
-
-  const brokenImages = {}
-  const brokenAnchors = {}
-  const brokenLinks = {}
-
-  beforeAll(async (done) => {
-    const pages = await loadPages()
-    const siteData = await loadSiteData()
-    const redirects = await loadRedirects(pages)
-
-    context.pages = pages
-    context.site = siteData[languageCode].site
-    context.redirects = redirects
-
-    const developerPages = pages
-      .filter(page => page.relativePath.match(developerContentRegex) && page.languageCode === languageCode)
-
-    let checkedLinks = {}
-    let checkedImages = {}
-
-    for (const page of developerPages) {
-      const brokenImagesPerPage = {}
-      const brokenAnchorsPerPage = {}
-      const brokenLinksPerPage = {}
-
-      // get an array of the pages product versions
-      const pageVersions = getApplicableVersions(page.versions, page.relativePath)
-
-      for (const pageVersion of pageVersions) {
-        // attach page-specific properties to context
-        page.version = pageVersion
-        context.page = page
-        context.currentVersion = pageVersion
-        context.enterpriseServerVersions = enterpriseServerVersions
-
-        const relevantPermalink = page.permalinks.find(permalink => permalink.pageVersion === pageVersion)
-
-        const graphqlVersion = allVersions[pageVersion].miscVersionName
-
-        // borrowed from middleware/contextualizers/graphql.js
-        context.graphql = {
-          schemaForCurrentVersion: require(`../../lib/graphql/static/schema-${graphqlVersion}`),
-          previewsForCurrentVersion: previews[graphqlVersion],
-          upcomingChangesForCurrentVersion: upcomingChanges[graphqlVersion],
-          prerenderedObjectsForCurrentVersion: prerenderedObjects[graphqlVersion],
-          changelog
-        }
-
-        // borrowed from middleware/contextualizers/rest.js
-        context.restGitHubAppsLink = getVersionedPathWithLanguage(
-          '/developers/apps',
-          pageVersion,
-          languageCode
-        )
-
-        context.operationsForCurrentProduct = context.rest.operations[pageVersion] || []
-
-        if (relevantPermalink.href.includes('rest/reference/')) {
-          const docsPath = relevantPermalink.href
-            .split('rest/reference/')[1]
-            .split('#')[0] // do not include #fragments
-
-          // find all operations that with an operationID that matches the requested docs path
-          context.currentRestOperations = context.operationsForCurrentProduct
-            .filter(operation => operation.operationId.startsWith(docsPath))
-        }
-
-        // collect elements of the page that may contain links
-        const pageContent = relevantPermalink.href.includes('graphql/reference/objects')
-          ? page.markdown + context.graphql.prerenderedObjectsForCurrentVersion.html
-          : page.intro + page.permissions + page.markdown
-
-        // renderContent is much faster than page.render, even though we later have to run
-        // rewriteLocalLinks in check-images and rewriteAssetPathsToS3 in check-links
-        const pageHtml = await renderContent(pageContent, context)
-        const $ = cheerio.load(pageHtml, { xmlMode: true })
-
-        // check images
-        const { brokenImages: brokenImagesPerVersion, checkedImageCache } = await checkImages($, pageVersion, page.relativePath, checkedImages)
-        if (brokenImagesPerVersion.length) brokenImagesPerPage[pageVersion] = brokenImagesPerVersion
-        checkedImages = checkedImageCache
-
-        // check anchors and links
-        const { brokenLinks: brokenLinksPerVersion, checkedLinkCache } = await checkLinks($, page, context, pageVersion, checkedLinks)
-        if (brokenLinksPerVersion.anchors.length) brokenAnchorsPerPage[pageVersion] = brokenLinksPerVersion.anchors
-        if (brokenLinksPerVersion.links.length) brokenLinksPerPage[pageVersion] = brokenLinksPerVersion.links
-        checkedLinks = checkedLinkCache
-      }
-
-      if (Object.keys(brokenImagesPerPage).length) brokenImages[page.fullPath] = brokenImagesPerPage
-      if (Object.keys(brokenAnchorsPerPage).length) brokenAnchors[page.fullPath] = brokenAnchorsPerPage
-      if (Object.keys(brokenLinksPerPage).length) brokenLinks[page.fullPath] = brokenLinksPerPage
-    }
-
-    done()
-  })
-
-  test('every page has image references that can be resolved', async () => {
-    const numbrokenImages = getNumBrokenItems(brokenImages)
-    expect(numbrokenImages, `Found ${numbrokenImages} total broken images: ${JSON.stringify(brokenImages, null, 2)}`).toBe(0)
-  })
-
-  test.skip('every page has links with anchors that can be resolved', async () => {
-    const numbrokenAnchors = getNumBrokenItems(brokenAnchors)
-    expect(numbrokenAnchors, `Found ${numbrokenAnchors} total broken anchors: ${JSON.stringify(brokenAnchors, null, 2)}`).toBe(0)
-  })
-
-  // disable anchor test til we resolve broken anchors
-  test.skip('every page has links that can be resolved', async () => {
-    const numbrokenLinks = getNumBrokenItems(brokenLinks)
-    expect(numbrokenLinks, `Found ${numbrokenLinks} total broken links: ${JSON.stringify(brokenLinks, null, 2)}`).toBe(0)
-  })
-})
-
-// count all the nested items
-function getNumBrokenItems (items) {
-  // filter for entries like this:
-  // '/article-path-here.md.dotcom.1.broken link': '/en/articles/foo',
-  return Object.keys(flat(items))
-    .filter(key => last(key.split('.')).includes('broken'))
-    .length
-}

From 3469049d70518b044042bf7fe36e035d2144a142 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 25 Nov 2020 20:05:18 -0500
Subject: [PATCH 03/40] delete no longer needed link checking code

---
 lib/check-links.js | 122 ---------------------------------------------
 1 file changed, 122 deletions(-)
 delete mode 100644 lib/check-links.js

diff --git a/lib/check-links.js b/lib/check-links.js
deleted file mode 100644
index 1d000da7f0..0000000000
--- a/lib/check-links.js
+++ /dev/null
@@ -1,122 +0,0 @@
-const cheerio = require('cheerio')
-const findPageInVersion = require('./find-page-in-version')
-const renderContent = require('./render-content')
-const rewriteLocalLinks = require('./rewrite-local-links')
-const nonEnterpriseDefaultVersion = require('./non-enterprise-default-version')
-const { getPathWithoutLanguage } = require('./path-utils')
-const { getEnterpriseVersionNumber, adminProduct } = require('./patterns')
-const { deprecated, latest } = require('./enterprise-server-releases')
-
-// internal links will have a language code by the time we're testing them
-// we also want to capture same-page anchors (#foo)
-const languageCode = 'en'
-const internalHrefs = ['/en', '#']
-
-const renderedPageCache = {}
-const checkedAnchorCache = {}
-
-module.exports = async function checkLinks ($, page, context, version, checkedLinkCache = {}) {
-  // run rewriteLocalLinks to version links and add language codes
-  rewriteLocalLinks($, version, languageCode)
-
-  const brokenLinks = {
-    anchors: [],
-    links: []
-  }
-
-  // internal link check
-  for (const href of internalHrefs) {
-    const internalLinks = $(`a[href^="${href}"]`).get()
-
-    for (const internalLink of internalLinks) {
-      const href = $(internalLink).attr('href')
-
-      // enable caching so we don't check links more than once
-      // anchor links are cached locally (within this run) since they are specific to the page
-      if (checkedLinkCache[href] || checkedAnchorCache[href]) continue
-
-      const [link, anchor] = href.split('#')
-
-      // if anchor only (e.g., #foo), look for heading on same page
-      if (anchor && !link) {
-        // ignore anchors that are autogenerated from headings
-        if (anchor === $(internalLink).parent().attr('id')) continue
-
-        const matchingHeadings = getMatchingHeadings($, anchor)
-
-        if (matchingHeadings.length === 0) {
-          brokenLinks.anchors.push({ 'broken same-page anchor': `#${anchor}`, reason: 'heading not found on page' })
-        }
-        checkedAnchorCache[href] = true
-        continue
-      }
-      checkedLinkCache[href] = true
-
-      // skip rare hardcoded links to old GHE versions
-      // these paths will always be in the old versioned form
-      // example: /enterprise/11.10.340/admin/articles/upgrading-to-the-latest-release
-      const gheVersionInLink = link.match(getEnterpriseVersionNumber)
-      if (gheVersionInLink && deprecated.includes(gheVersionInLink[1])) continue
-
-      // look for linked page
-      const isDotcomOnly = $(internalLink).attr('class')
-
-      // special case for GHES Admin links on dotcom, which are not broken; they go to the latest GHES version
-      let versionToCheck = version
-      if (version === nonEnterpriseDefaultVersion && adminProduct.test(link)) {
-        versionToCheck = `enterprise-server@${latest}`
-      }
-
-      const linkedPage = findPageInVersion(link, context.pages, context.redirects, languageCode, versionToCheck, isDotcomOnly)
-
-      if (!linkedPage) {
-        brokenLinks.links.push({ 'broken link': link, reason: 'linked page not found' })
-        continue
-      }
-
-      // don't check anchors on developers content
-      if (linkedPage.relativePath.match(/^(rest|graphql|developers)/)) continue
-
-      // create a unique string for caching purposes
-      const pathToCache = version + linkedPage.relativePath
-
-      const anchorToCheck = anchor
-
-      // if link with anchor (e.g., /some/path#foo), look for heading on linked page
-      if (anchorToCheck) {
-        // either render page or fetch it from cache if we've already rendered it
-        let linkedPageObject
-        if (!renderedPageCache[pathToCache]) {
-          const linkedPageHtml = await renderContent(linkedPage.markdown, context)
-          linkedPageObject = cheerio.load(linkedPageHtml, { xmlMode: true })
-          renderedPageCache[pathToCache] = linkedPageObject
-        } else {
-          linkedPageObject = renderedPageCache[pathToCache]
-        }
-
-        const matchingHeadings = getMatchingHeadings(linkedPageObject, anchorToCheck)
-
-        if (matchingHeadings.length === 0) {
-          if (anchor) {
-            brokenLinks.anchors.push({ 'broken anchor': `#${anchor}`, 'full link': `${getPathWithoutLanguage(link)}#${anchor}`, reason: 'heading not found on linked page', 'linked page': linkedPage.fullPath })
-          }
-          continue
-        }
-      }
-    }
-  }
-
-  return { brokenLinks, checkedLinkCache }
-}
-
-// article titles are h1s; headings can be any subsequent level
-function getMatchingHeadings ($, anchor) {
-  return $(`
-    h2[id="${anchor}"],
-    h3[id="${anchor}"],
-    h4[id="${anchor}"],
-    h5[id="${anchor}"],
-    h6[id="${anchor}"],
-    a[name="${anchor}"]
-  `)
-}

From a1517ce1da17e562be454aea96452c1f793b4d1c Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 25 Nov 2020 20:05:34 -0500
Subject: [PATCH 04/40] delete no longer needed link checking code

---
 lib/check-developer-links.js | 137 -----------------------------------
 1 file changed, 137 deletions(-)
 delete mode 100644 lib/check-developer-links.js

diff --git a/lib/check-developer-links.js b/lib/check-developer-links.js
deleted file mode 100644
index e5e708be88..0000000000
--- a/lib/check-developer-links.js
+++ /dev/null
@@ -1,137 +0,0 @@
-const cheerio = require('cheerio')
-const findPageInVersion = require('./find-page-in-version')
-const renderContent = require('./render-content')
-const rewriteLocalLinks = require('./rewrite-local-links')
-const nonEnterpriseDefaultVersion = require('./non-enterprise-default-version')
-const { getPathWithoutLanguage } = require('./path-utils')
-const { getEnterpriseVersionNumber, adminProduct } = require('./patterns')
-const { deprecated, latest } = require('./enterprise-server-releases')
-
-// internal links will have a language code by the time we're testing them
-// we also want to capture same-page anchors (#foo)
-const languageCode = 'en'
-const internalHrefs = ['/en', '#']
-
-const renderedPageCache = {}
-const checkedAnchorCache = {}
-
-module.exports = async function checkLinks ($, page, context, version, checkedLinkCache = {}) {
-  // run rewriteLocalLinks to version links and add language codes
-  rewriteLocalLinks($, version, languageCode)
-
-  const brokenLinks = {
-    anchors: [],
-    links: []
-  }
-
-  // internal link check
-  for (const href of internalHrefs) {
-    const internalLinks = $(`a[href^="${href}"]`).get()
-
-    for (const internalLink of internalLinks) {
-      const href = $(internalLink).attr('href')
-
-      // enable caching so we don't check links more than once
-      // anchor links are cached locally (within this run) since they are specific to the page
-      if (checkedLinkCache[href] || checkedAnchorCache[href]) continue
-
-      const [link, anchor] = href.split('#')
-
-      // if anchor only (e.g., #foo), look for heading on same page
-      if (anchor && !link) {
-        // ignore anchors that are autogenerated from headings
-        if (anchor === $(internalLink).parent().attr('id')) continue
-
-        const matchingHeadings = getMatchingHeadings($, anchor)
-
-        if (matchingHeadings.length === 0) {
-          brokenLinks.anchors.push({ 'broken same-page anchor': `#${anchor}`, reason: 'heading not found on page' })
-        }
-        checkedAnchorCache[href] = true
-        continue
-      }
-      checkedLinkCache[href] = true
-
-      // skip rare hardcoded links to old GHE versions
-      // these paths will always be in the old versioned form
-      // example: /enterprise/11.10.340/admin/articles/upgrading-to-the-latest-release
-      const gheVersionInLink = link.match(getEnterpriseVersionNumber)
-      if (gheVersionInLink && deprecated.includes(gheVersionInLink[1])) continue
-
-      // look for linked page
-      const isDotcomOnly = $(internalLink).attr('class')
-
-      // special case for GHES Admin links on dotcom, which are not broken; they go to the latest GHES version
-      let versionToCheck = version
-      if (version === nonEnterpriseDefaultVersion && adminProduct.test(link)) {
-        versionToCheck = `enterprise-server@${latest}`
-      }
-
-      const linkedPage = findPageInVersion(link, context.pages, context.redirects, languageCode, versionToCheck, isDotcomOnly)
-
-      if (!linkedPage) {
-        brokenLinks.links.push({ 'broken link': link, reason: 'linked page not found' })
-        continue
-      }
-
-      if (linkedPage.relativePath.includes('rest/reference/') && linkedPage.relativePath !== 'rest/reference/index.md') {
-        const linkedPageRelevantPermalink = linkedPage.permalinks.find(permalink => permalink.pageVersion === version)
-        if (!linkedPageRelevantPermalink) continue
-
-        const docsPath = linkedPageRelevantPermalink.href
-          .split('rest/reference/')[1]
-          .split('#')[0] // do not include #fragments
-
-        // find all operations that with an operationID that matches the requested docs path
-        context.currentRestOperations = context.operationsForCurrentProduct
-          .filter(operation => operation.operationId.startsWith(docsPath))
-      }
-
-      // collect elements of the page that may contain links
-      const linkedPageContent = linkedPage.relativePath.includes('graphql/reference/objects')
-        ? linkedPage.markdown + context.graphql.prerenderedObjectsForCurrentVersion.html
-        : linkedPage.markdown
-
-      // create a unique string for caching purposes
-      const pathToCache = version + linkedPage.relativePath
-
-      const anchorToCheck = anchor
-
-      // if link with anchor (e.g., /some/path#foo), look for heading on linked page
-      if (anchorToCheck) {
-        // either render page or fetch it from cache if we've already rendered it
-        let linkedPageObject
-        if (!renderedPageCache[pathToCache]) {
-          const linkedPageHtml = await renderContent(linkedPageContent, context)
-          linkedPageObject = cheerio.load(linkedPageHtml, { xmlMode: true })
-          renderedPageCache[pathToCache] = linkedPageObject
-        } else {
-          linkedPageObject = renderedPageCache[pathToCache]
-        }
-
-        const matchingHeadings = getMatchingHeadings(linkedPageObject, anchorToCheck)
-
-        if (matchingHeadings.length === 0) {
-          if (anchor) {
-            brokenLinks.anchors.push({ 'broken anchor': `#${anchor}`, 'full link': `${getPathWithoutLanguage(link)}#${anchor}`, reason: 'heading not found on linked page', 'linked page': linkedPage.fullPath })
-          }
-          continue
-        }
-      }
-    }
-  }
-
-  return { brokenLinks, checkedLinkCache }
-}
-
-// article titles are h1s; headings can be any subsequent level
-function getMatchingHeadings ($, anchor) {
-  return $(`
-    h2[id="${anchor}"],
-    h3[id="${anchor}"],
-    h4[id="${anchor}"],
-    h5[id="${anchor}"],
-    h6[id="${anchor}"],
-    a[name="${anchor}"]
-  `).get()
-}

From f4838746878cc3826eece8793fa89e5a76d72672 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 25 Nov 2020 20:12:45 -0500
Subject: [PATCH 05/40] lint

---
 tests/helpers/links-checker.js             | 29 +++++++++++-----------
 tests/links-and-images/links-and-images.js |  6 ++---
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/tests/helpers/links-checker.js b/tests/helpers/links-checker.js
index b85e1c47c4..0725bbf0db 100644
--- a/tests/helpers/links-checker.js
+++ b/tests/helpers/links-checker.js
@@ -5,9 +5,8 @@ const path = require('path')
 
 const { getVersionStringFromPath } = require('../../lib/path-utils')
 const patterns = require('../../lib/patterns')
-const { deprecated, latest } = require('../../lib/enterprise-server-releases')
+const { deprecated } = require('../../lib/enterprise-server-releases')
 const findPageInVersion = require('../../lib/find-page-in-version')
-const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 const rest = require('../../middleware/contextualizers/rest')
 const graphql = require('../../middleware/contextualizers/graphql')
 const contextualize = require('../../middleware/context')
@@ -97,7 +96,7 @@ class LinksChecker {
 
     const pathCacheKey = `${version}:${path}`
     const $ = await this.getRenderedPageObj(pathCacheKey, context)
-    
+
     const imageSrcs = $('img[src^="/assets"]').map((i, el) => $(el).attr('src')).toArray()
 
     this.addImagesForLater(imageSrcs, pathCacheKey)
@@ -131,7 +130,7 @@ class LinksChecker {
           continue
         }
 
-        //------ BEGIN ONEOFF EXCLUSIONS -------///
+        // ------ BEGIN ONEOFF EXCLUSIONS -------///
         // skip GraphQL public schema paths (these are checked by separate tests)
         if (link.startsWith('/public/') && link.endsWith('.graphql')) continue
 
@@ -144,7 +143,7 @@ class LinksChecker {
         // example: /enterprise/11.10.340/admin/articles/upgrading-to-the-latest-release
         const gheVersionInLink = link.match(patterns.getEnterpriseVersionNumber)
         if (gheVersionInLink && deprecated.includes(gheVersionInLink[1])) continue
-        //------ END ONEOFF EXCLUSIONS -------///
+        // ------ END ONEOFF EXCLUSIONS -------///
 
         // look for linked page
         const versionFromHref = getVersionStringFromPath(link)
@@ -155,7 +154,7 @@ class LinksChecker {
           this.brokenLinks.set(link, { linkedFrom: [pathCacheKey] })
           continue
         }
-        
+
         // if we're not checking external anchors, we're done
         if (!checkExternalAnchors) {
           continue
@@ -165,7 +164,7 @@ class LinksChecker {
         const linkedPagePermalink = linkedPage.permalinks.find(permalink => permalink.pageVersion === version)
 
         if (linkedPagePermalink) {
-          const linkedPageContext = await buildPathContext(context, linkedPage, linkedPagePermalink) 
+          const linkedPageContext = await buildPathContext(context, linkedPage, linkedPagePermalink)
 
           if (anchor) {
             await this.setRenderedPageObj(`${version}:${linkedPage.relativePath}`, linkedPageContext)
@@ -217,10 +216,10 @@ async function applyMiddleware (middleware, req) {
 }
 
 async function buildInitialContext () {
-  const req = { 
+  const req = {
     path: '/en',
-    language: 'en', 
-    query: {} 
+    language: 'en',
+    query: {}
   }
   await applyMiddleware(contextualize, req)
   return req.context
@@ -231,13 +230,13 @@ async function buildPathContext (context, page, permalink) {
     page,
     currentVersion: permalink.pageVersion,
     relativePath: permalink.relativePath
-  } 
- 
-  const req = { 
+  }
+
+  const req = {
     path: permalink.href,
     context: Object.assign({}, context, pathContext),
     language: 'en',
-    query: {} 
+    query: {}
   }
 
   await applyMiddleware(rest, req)
@@ -252,4 +251,4 @@ module.exports = {
   LinksChecker,
   buildPathContext,
   buildInitialContext
-}
\ No newline at end of file
+}
diff --git a/tests/links-and-images/links-and-images.js b/tests/links-and-images/links-and-images.js
index 29fae220b9..200f597bfa 100644
--- a/tests/links-and-images/links-and-images.js
+++ b/tests/links-and-images/links-and-images.js
@@ -1,4 +1,4 @@
-const { LinksChecker, buildInitialContext, buildPathContext, updateContextPerPath } = require('../helpers/links-checker')
+const { LinksChecker, buildInitialContext, buildPathContext } = require('../helpers/links-checker')
 const languageCode = 'en'
 
 // TODO set to true when we're ready to report and fix broken anchors
@@ -32,7 +32,7 @@ describe('page rendering', () => {
     expect(result.size, `Found ${result.size} total broken images: ${JSON.stringify([...result], null, 2)}`).toBe(0)
   })
 
-  // When ready to unskip this, 
+  // When ready to unskip this,
   test.skip('every page has links with anchors that can be resolved', async () => {
     const result = await linksChecker.getBrokenAnchors()
     const numBrokenAnchors = [...result].reduce((accumulator, [path, anchors]) => accumulator + Object.keys(anchors).length, 0)
@@ -43,4 +43,4 @@ describe('page rendering', () => {
     const result = linksChecker.getBrokenLinks()
     expect(result.size, `Found ${result.size} total broken links: ${JSON.stringify([...result], null, 2)}`).toBe(0)
   })
-})
\ No newline at end of file
+})

From a8e12608fafc2d0f70e81a19499d6ac8d185a54d Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@users.noreply.github.com>
Date: Mon, 30 Nov 2020 13:26:41 -0500
Subject: [PATCH 06/40] Update tests/helpers/links-checker.js

Co-authored-by: Kevin Heis <heiskr@users.noreply.github.com>
---
 tests/helpers/links-checker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/helpers/links-checker.js b/tests/helpers/links-checker.js
index 0725bbf0db..5e02cb581a 100644
--- a/tests/helpers/links-checker.js
+++ b/tests/helpers/links-checker.js
@@ -76,7 +76,7 @@ class LinksChecker {
 
   addAnchorForLater (pagePath, anchor, linkedFrom) {
     const anchorsInPath = this.anchorLinksToCheck.get(pagePath) || {}
-    const anchorLink = anchorsInPath[anchor] ? anchorsInPath[anchor] : { linkedFrom: [] }
+    const anchorLink = anchorsInPath[anchor] || { linkedFrom: [] }
     anchorLink.linkedFrom = union(anchorLink.linkedFrom, [linkedFrom])
     anchorsInPath[anchor] = anchorLink
     this.anchorLinksToCheck.set(pagePath, anchorsInPath)

From 74fe86d91ebbed58e74ec4e3ce73cd79aecf90e6 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Tue, 1 Dec 2020 10:16:05 -0500
Subject: [PATCH 07/40] clarify what is happening with the context objects

---
 tests/helpers/links-checker.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/helpers/links-checker.js b/tests/helpers/links-checker.js
index 5e02cb581a..a86409666d 100644
--- a/tests/helpers/links-checker.js
+++ b/tests/helpers/links-checker.js
@@ -10,8 +10,8 @@ const findPageInVersion = require('../../lib/find-page-in-version')
 const rest = require('../../middleware/contextualizers/rest')
 const graphql = require('../../middleware/contextualizers/graphql')
 const contextualize = require('../../middleware/context')
-// TODO enable when release notes are live
-// const releaseNotes = require('../../middleware/contextualizers/enterprise-release-notes')
+const releaseNotes = require('../../middleware/contextualizers/enterprise-release-notes')
+const versionSatisfiesRange = require('../../lib/version-satisfies-range')
 
 class LinksChecker {
   constructor (opts = { languageCode: 'en', internalHrefPrefixes: ['/', '#'] }) {
@@ -225,26 +225,35 @@ async function buildInitialContext () {
   return req.context
 }
 
-async function buildPathContext (context, page, permalink) {
+async function buildPathContext (initialContext, page, permalink) {
+  // Create a new object with path-specific properties
   const pathContext = {
     page,
     currentVersion: permalink.pageVersion,
     relativePath: permalink.relativePath
   }
 
+  // Combine it with the initial context object that has pages, redirects, etc.
+  const combinedContext = Object.assign({}, initialContext, pathContext)
+
+  // Create a new req object using the combined context
   const req = {
     path: permalink.href,
-    context: Object.assign({}, context, pathContext),
+    context: combinedContext,
     language: 'en',
     query: {}
   }
 
+  // Pass the req to the contextualizing middlewares
   await applyMiddleware(rest, req)
   await applyMiddleware(graphql, req)
-  // TODO enable when release notes are live
-  // await applyMiddleware(releaseNotes, req)
+  // Release notes are on docs site starting with GHES 3.0
+  if (versionSatisfiesRange(permalink.pageVersion, '>=3.0')) {
+    await applyMiddleware(releaseNotes, req)
+  }
 
-  return Object.assign({}, context, req.context)
+  // Return the resulting context object with REST, GraphQL, and release notes data now attached
+  return req.context
 }
 
 module.exports = {

From 432d13fd320c65af923ddec50de2485435807c54 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Tue, 1 Dec 2020 10:25:23 -0500
Subject: [PATCH 08/40] Add more detail in comment

---
 tests/helpers/links-checker.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/helpers/links-checker.js b/tests/helpers/links-checker.js
index a86409666d..ca69d76644 100644
--- a/tests/helpers/links-checker.js
+++ b/tests/helpers/links-checker.js
@@ -226,7 +226,12 @@ async function buildInitialContext () {
 }
 
 async function buildPathContext (initialContext, page, permalink) {
-  // Create a new object with path-specific properties
+  // Create a new object with path-specific properties.
+  // Note this is cherry-picking properties currently only needed by the middlware below;
+  // See middleware/context.js for the rest of the properties we are NOT refreshing per page.
+  // If we find this causes problems for link checking, we can call `contextualize` on
+  // every page. For now, this cherry-picking approach is intended to improve performance so
+  // we don't have to build the expensive `pages`, `redirects`, etc. data on every page we check.
   const pathContext = {
     page,
     currentVersion: permalink.pageVersion,
@@ -247,7 +252,7 @@ async function buildPathContext (initialContext, page, permalink) {
   // Pass the req to the contextualizing middlewares
   await applyMiddleware(rest, req)
   await applyMiddleware(graphql, req)
-  // Release notes are on docs site starting with GHES 3.0
+  // Release notes are available on docs site starting with GHES 3.0
   if (versionSatisfiesRange(permalink.pageVersion, '>=3.0')) {
     await applyMiddleware(releaseNotes, req)
   }

From f27002810f3b44e187767ab6a841303141d02459 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Tue, 8 Dec 2020 16:02:15 -0500
Subject: [PATCH 09/40] req.context.pages is now an object, we need it to be an
 array

---
 tests/links-and-images/links-and-images.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/links-and-images/links-and-images.js b/tests/links-and-images/links-and-images.js
index 8e4f06e598..aa9d104d74 100644
--- a/tests/links-and-images/links-and-images.js
+++ b/tests/links-and-images/links-and-images.js
@@ -1,4 +1,5 @@
 const { LinksChecker, buildInitialContext, buildPathContext } = require('../helpers/links-checker')
+const { uniq } = require('lodash')
 const languageCode = 'en'
 
 // TODO set to true when we're ready to report and fix broken anchors
@@ -14,7 +15,7 @@ describe('page rendering', () => {
     // we only want to build these one time
     const context = await buildInitialContext()
 
-    const englishPages = context.pages
+    const englishPages = uniq(Object.values(context.pages))
       .filter(page => page.languageCode === languageCode)
 
     for (const page of englishPages) {

From 10152fa15a665cf6a506d8d97fdb97911770f1e9 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 9 Dec 2020 15:12:39 -0500
Subject: [PATCH 10/40] lint

---
 tests/links-and-images/links-and-images.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/links-and-images/links-and-images.js b/tests/links-and-images/links-and-images.js
index aa9d104d74..8a907576e3 100644
--- a/tests/links-and-images/links-and-images.js
+++ b/tests/links-and-images/links-and-images.js
@@ -44,4 +44,4 @@ describe('page rendering', () => {
     const result = linksChecker.getBrokenLinks()
     expect(result.size, `Found ${result.size} total broken links: ${JSON.stringify([...result], null, 2)}`).toBe(0)
   })
-})
\ No newline at end of file
+})

From 8e1455ebe151fc9efd3b4ddef8aa10fdae4bd32b Mon Sep 17 00:00:00 2001
From: Sarah Edwards <skedwards88@github.com>
Date: Thu, 10 Dec 2020 10:28:12 -0800
Subject: [PATCH 11/40] Fix broken links (#16700)

* delete section describing use of oauth api in dotcom only section

* version mention of oauth api for ghae only

* version code scanning alert not for ghae

* version security alerts to not be for GHAE

* version Libraries article to include GHAE

* version links to beta and suspending apps to not be for GHAE or GHES

* version link to authorization API to be GHES only

Co-authored-by: Sarah Schneider <sarahs@github.com>
---
 .../apps/creating-a-github-app-using-url-parameters.md        | 4 ++--
 .../apps/identifying-and-authorizing-users-for-github-apps.md | 2 +-
 .../developers/apps/suspending-a-github-app-installation.md   | 2 --
 content/developers/overview/managing-deploy-keys.md           | 2 ++
 .../webhooks-and-events/webhook-events-and-payloads.md        | 4 +++-
 content/rest/overview/libraries.md                            | 1 +
 content/rest/reference/enterprise-admin.md                    | 2 +-
 .../pre-release-program/suspend-installation-beta.md          | 3 ---
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/developers/apps/creating-a-github-app-using-url-parameters.md b/content/developers/apps/creating-a-github-app-using-url-parameters.md
index e2008f06bf..99d0f03a93 100644
--- a/content/developers/apps/creating-a-github-app-using-url-parameters.md
+++ b/content/developers/apps/creating-a-github-app-using-url-parameters.md
@@ -79,8 +79,8 @@ Permission | Description
 [`single_file`](/rest/reference/permissions-required-for-github-apps/#permission-on-single-file) | Grants access to the [Contents API](/rest/reference/repos#contents). Can be one of: `none`, `read`, or `write`.
 [`starring`](/rest/reference/permissions-required-for-github-apps/#permission-on-starring) | Grants access to the [Starring API](/rest/reference/activity#starring). Can be one of: `none`, `read`, or `write`.
 [`statuses`](/rest/reference/permissions-required-for-github-apps/#permission-on-statuses) | Grants access to the [Statuses API](/rest/reference/repos#statuses). Can be one of: `none`, `read`, or `write`.
-[`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/rest/reference/teams#discussions) and the [Team Discussion Comments API](/rest/reference/teams#discussion-comments). Can be one of: `none`, `read`, or `write`.
-`vulnerability_alerts`| Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`.
+[`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/rest/reference/teams#discussions) and the [Team Discussion Comments API](/rest/reference/teams#discussion-comments). Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@1.19" %}
+`vulnerability_alerts`| Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`.{% endif %}
 `watching` | Grants access to list and change repositories a user is subscribed to. Can be one of: `none`, `read`, or `write`.
 
 ### {% data variables.product.prodname_github_app %} webhook events
diff --git a/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
index 20826403c5..ae02a509fc 100644
--- a/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
+++ b/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
@@ -67,7 +67,7 @@ If the user accepts your request, GitHub redirects back to your site with a temp
 
 {% endnote %}
 
-Exchange this `code` for an access token. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %} When expiring tokens are enabled, the access token expires in 8 hours and the refresh token expires in 6 months. Every time you refresh the token, you get a new refresh token. For more information, see "[Refreshing user-to-server access tokens](/developers/apps/refreshing-user-to-server-access-tokens)."
+Exchange this `code` for an access token. {% if currentVersion == "free-pro-team@latest" %} When expiring tokens are enabled, the access token expires in 8 hours and the refresh token expires in 6 months. Every time you refresh the token, you get a new refresh token. For more information, see "[Refreshing user-to-server access tokens](/developers/apps/refreshing-user-to-server-access-tokens)."
 
 Expiring user tokens are currently part of the user-to-server token expiration beta and subject to change. To opt-in to the user-to-server token expiration beta feature, see "[Activating beta features for apps](/developers/apps/activating-beta-features-for-apps)."{% endif %}
 
diff --git a/content/developers/apps/suspending-a-github-app-installation.md b/content/developers/apps/suspending-a-github-app-installation.md
index ac4cf127d3..34b6df1e3b 100644
--- a/content/developers/apps/suspending-a-github-app-installation.md
+++ b/content/developers/apps/suspending-a-github-app-installation.md
@@ -7,13 +7,11 @@ versions:
   free-pro-team: '*'
 ---
 
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
 {% note %}
 
 **Note:** {% data reusables.pre-release-program.suspend-installation-beta %}
 
 {% endnote %}
-{% endif %}
 
 ### Suspending a GitHub App
 
diff --git a/content/developers/overview/managing-deploy-keys.md b/content/developers/overview/managing-deploy-keys.md
index b1c958c590..d97cec6391 100644
--- a/content/developers/overview/managing-deploy-keys.md
+++ b/content/developers/overview/managing-deploy-keys.md
@@ -44,7 +44,9 @@ If you don't want to use SSH keys, you can use [HTTPS with OAuth tokens][git-aut
 * Users don't have to change their local SSH settings.
 * Multiple tokens (one for each user) are not needed; one token per server is enough.
 * A token can be revoked at any time, turning it essentially into a one-use password.
+{% if enterpriseServerVersions contains currentVersion %}
 * Generating new tokens can be easily scripted using [the OAuth API](/rest/reference/oauth-authorizations#create-a-new-authorization).
+{% endif %}
 
 ##### Cons
 
diff --git a/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/content/developers/webhooks-and-events/webhook-events-and-payloads.md
index 922e672102..a2dfc5a9d7 100644
--- a/content/developers/webhooks-and-events/webhook-events-and-payloads.md
+++ b/content/developers/webhooks-and-events/webhook-events-and-payloads.md
@@ -430,7 +430,7 @@ Key | Type | Description
 
 {% endnote %}
 
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %}
+{% if currentVersion == "free-pro-team@latest" %}
 {% note %}
 
 **Note:** {% data reusables.pre-release-program.suspend-installation-beta %} For more information, see "[Suspending a {% data variables.product.prodname_github_app %} installation](/apps/managing-github-apps/suspending-a-github-app-installation/)."
@@ -1124,9 +1124,11 @@ Key | Type | Description
 {{ webhookPayloadsForCurrentVersion.secret_scanning_alert.reopened }}
 {% endif %}
 
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@1.19" %}
 ### security_advisory
 
 Activity related to a security advisory. A security advisory provides information about security-related vulnerabilities in software on GitHub. The security advisory dataset also powers the GitHub security alerts, see "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies/)."
+{% endif %}
 
 #### Availability
 
diff --git a/content/rest/overview/libraries.md b/content/rest/overview/libraries.md
index f72b9b3b65..68c9ab862b 100644
--- a/content/rest/overview/libraries.md
+++ b/content/rest/overview/libraries.md
@@ -7,6 +7,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 <div class="jumbotron libraries-jumbotron">
diff --git a/content/rest/reference/enterprise-admin.md b/content/rest/reference/enterprise-admin.md
index a35266becc..1f8fda8b12 100644
--- a/content/rest/reference/enterprise-admin.md
+++ b/content/rest/reference/enterprise-admin.md
@@ -40,7 +40,7 @@ http(s)://<em>hostname</em>/
 {% if currentVersion == "github-ae@latest" or enterpriseServerVersions contains currentVersion %}
 ### Authentication
 
-Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if enterpriseServerVersions contains currentVersion %}
+Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** {% if enterpriseServerVersions contains currentVersion %}(which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) {% endif %}or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if enterpriseServerVersions contains currentVersion %}
 OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %}
 
 Enterprise administration API endpoints are only accessible to authenticated {% data variables.product.product_name %} site administrators{% if enterpriseServerVersions contains currentVersion %}, except for the [Management Console](#management-console) API, which requires the [Management Console password](/enterprise/admin/articles/accessing-the-management-console/){% endif %}.
diff --git a/data/reusables/pre-release-program/suspend-installation-beta.md b/data/reusables/pre-release-program/suspend-installation-beta.md
index 42ef3db1bc..2bab45542f 100644
--- a/data/reusables/pre-release-program/suspend-installation-beta.md
+++ b/data/reusables/pre-release-program/suspend-installation-beta.md
@@ -1,4 +1 @@
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %}
 Suspending a {% data variables.product.prodname_github_app %} installation is currently in beta and subject to change. Before you can suspend a {% data variables.product.prodname_github_app %}, the app owner must enable suspending installations for the app by opting-in to the beta. To opt-in to the suspending installations beta feature, see "[Activating beta features for apps](/developers/apps/activating-beta-features-for-apps)."
-
-{% endif %}

From 9973c61b41a1d9ed2b44c7623b59b5f17d31164e Mon Sep 17 00:00:00 2001
From: Sarah Edwards <skedwards88@github.com>
Date: Thu, 10 Dec 2020 14:25:14 -0800
Subject: [PATCH 12/40] fix broken links (#16881)

---
 .../pricing-plans-for-github-marketplace-apps.md                | 2 +-
 .../github-marketplace/requirements-for-listing-an-app.md       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md b/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md
index aa9d924b49..8e76577810 100644
--- a/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md
+++ b/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md
@@ -48,7 +48,7 @@ Customers can start a free trial for any paid plan on a Marketplace listing that
 
 Free trials have a fixed length of 14 days. Customers are notified 4 days before the end of their trial period (on day 11 of the free trial) that their plan will be upgraded. At the end of a free trial, customers will be auto-enrolled into the plan they are trialing if they do not cancel.
 
-For more information, see: "[Handling new purchases and free trials](/developers/github-marketplace/integrating-with-the-github-marketplace-api/handling-new-purchases-and-free-trials/)."
+For more information, see: "[Handling new purchases and free trials](/developers/github-marketplace/handling-new-purchases-and-free-trials/)."
 
 {% note %}
 
diff --git a/content/developers/github-marketplace/requirements-for-listing-an-app.md b/content/developers/github-marketplace/requirements-for-listing-an-app.md
index e54424b74a..39b4c2dc99 100644
--- a/content/developers/github-marketplace/requirements-for-listing-an-app.md
+++ b/content/developers/github-marketplace/requirements-for-listing-an-app.md
@@ -53,7 +53,7 @@ In addition to the requirements for all apps above, each app that you offer as a
 - {% data variables.product.prodname_github_app %}s should have a minimum of 100 installations.
 - {% data variables.product.prodname_oauth_app %}s should have a minimum of 200 users.
 - All paid apps must handle {% data variables.product.prodname_marketplace %} purchase events for new purchases, upgrades, downgrades, cancellations, and free trials. For more information, see "[Billing requirements for paid apps](#billing-requirements-for-paid-apps)" below.
-- Publishing organizations must have a verified domain and must enable two-factor authentication. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.")
+- Publishing organizations must have a verified domain and must enable two-factor authentication. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)."
 
 When you are ready to publish the app on {% data variables.product.prodname_marketplace %} you must request verification for the listing.
 

From dca55a0257c734eae1d5fb2fa7cf0601411e7288 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@users.noreply.github.com>
Date: Mon, 14 Dec 2020 20:25:01 -0500
Subject: [PATCH 13/40] Revert "Revert "sitetree optimizations""

---
 includes/breadcrumbs.html              |  2 +-
 includes/sidebar-guides.html           |  8 ++---
 includes/sidebar-specific-product.html | 10 +++---
 lib/find-page.js                       |  8 +++--
 lib/get-map-topic-content.js           | 22 ++++---------
 lib/page.js                            |  3 +-
 lib/site-tree.js                       | 43 ++++++++++++--------------
 middleware/breadcrumbs.js              | 22 +++----------
 middleware/early-access-breadcrumbs.js |  6 ++--
 tests/content/site-tree.js             | 12 +++----
 tests/rendering/breadcrumbs.js         | 26 ++++++++--------
 11 files changed, 70 insertions(+), 92 deletions(-)

diff --git a/includes/breadcrumbs.html b/includes/breadcrumbs.html
index 47dc43c17a..9fdc33acc4 100644
--- a/includes/breadcrumbs.html
+++ b/includes/breadcrumbs.html
@@ -3,7 +3,7 @@
   {% if breadcrumb[1].href == '' %}
   <span>{{breadcrumb[1].title}}</span>
   {% else %}
-  <a title="{{ breadcrumb[0]}}: {{breadcrumb[1].title}}" href="/{{currentLanguage}}{{breadcrumb[1].href}}" class="d-inline-block {% if breadcrumb[1].href == currentPathWithoutLanguage %}text-gray-light{% endif %}">
+  <a title="{{ breadcrumb[0]}}: {{breadcrumb[1].title}}" href="{{{breadcrumb[1].href}}" class="d-inline-block {% if breadcrumb[1].href == currentPath %}text-gray-light{% endif %}">
     {{breadcrumb[1].title}}</a>
   {% endif %}
   {% endfor %}
diff --git a/includes/sidebar-guides.html b/includes/sidebar-guides.html
index c24e084944..ef2e81b62b 100644
--- a/includes/sidebar-guides.html
+++ b/includes/sidebar-guides.html
@@ -1,17 +1,17 @@
 <ul class="sidebar-categories">
   {% for category in product[1].categories %}
   <li class="sidebar-category {% if breadcrumbs.category.href == category[1].href %}active{% endif %}">
-    <a href="/{{currentLanguage}}{{category[1].href}}">{{ category[1].title }}</a>
+    <a href="{{category[1].href}}">{{ category[1].title }}</a>
     <!-- some categories have topics with child articles -->
     {% if category[1].maptopics %}
     <ul class="sidebar-maptopics">
       {% for maptopic in category[1].maptopics %}
       <li class="sidebar-maptopic {% if breadcrumbs.maptopic.href == maptopic[1].href %}active{% endif %}">
-        <a href="/{{currentLanguage}}{{maptopic[1].href}}">{{ maptopic[1].title }}</a>
+        <a href="{{maptopic[1].href}}">{{ maptopic[1].title }}</a>
         <ul class="sidebar-articles">
           {% for article in maptopic[1].articles %}
           <li class="sidebar-article {% if currentPath == article[1].href %}active{% endif %}">
-            <a href="/{{currentLanguage}}{{article[1].href}}">{{ article[1].title }}</a>
+            <a href="{{article[1].href}}">{{ article[1].title }}</a>
           </li>
           {% endfor %}
         </ul>
@@ -23,7 +23,7 @@
     <ul class="sidebar-articles">
       {% for article in category[1].articles %}
       <li class="sidebar-article{% if currentPath == article[1].href %} active{% endif %}">
-        <a href="/{{currentLanguage}}{{article[1].href}}">{{ article[1].title }}</a>
+        <a href="{{article[1].href}}">{{ article[1].title }}</a>
       </li>
       {% endfor %}
     </ul>
diff --git a/includes/sidebar-specific-product.html b/includes/sidebar-specific-product.html
index 60ba3316bf..9072036ac7 100644
--- a/includes/sidebar-specific-product.html
+++ b/includes/sidebar-specific-product.html
@@ -10,12 +10,12 @@
 {% include all-products-link %}
 <li title="{{product.title}}" class="sidebar-product mb-2">
   {% unless page.hidden %}
-  <a href="/{{currentLanguage}}{{product.href}}" class="pl-4 pr-5 pb-1 f4">{{ product.title }}</a>
+  <a href="{{product.href}}" class="pl-4 pr-5 pb-1 f4">{{ product.title }}</a>
   {% endunless %}
 </li>
 <ul class="sidebar-categories list-style-none">
   {% for category in product.categories %}
-  {% capture fullPathToCategory %}/{{currentLanguage}}{{category[1].href}}{% endcapture %}
+  {% capture fullPathToCategory %}{{category[1].href}}{% endcapture %}
 
   <li class="sidebar-category py-1 {% if breadcrumbs.category.href == category[1].href %}active {% if currentPath == fullPathToCategory %}is-current-page {% endif %}{% endif %}{% if category[1].standalone %}standalone-category{% endif %}">
     {% if category[1].standalone %}
@@ -37,13 +37,13 @@
       <ul class="sidebar-topics list-style-none position-relative">
         {% for maptopic in category[1].maptopics %}
           {% unless maptopic[1].hidden %}
-            {% capture fullPathToMaptopic %}/{{currentLanguage}}{{maptopic[1].href}}{% endcapture %}
+            {% capture fullPathToMaptopic %}{{maptopic[1].href}}{% endcapture %}
 
             <li class="sidebar-maptopic {% if breadcrumbs.maptopic.href == maptopic[1].href %}active {% if currentPath == fullPathToMaptopic %}is-current-page{% endif %}{% endif %}">
               <a href="{{fullPathToMaptopic}}" class="pl-4 pr-5 py-2">{{ maptopic[1].title }}</a>
               <ul class="sidebar-articles my-2">
                 {% for article in maptopic[1].articles %}
-                {% capture fullPathToArticle %}/{{currentLanguage}}{{article[1].href}}{% endcapture %}
+                {% capture fullPathToArticle %}{{article[1].href}}{% endcapture %}
 
                 <li class="sidebar-article {% if breadcrumbs.article.href == article[1].href %}active {% if currentPath == fullPathToArticle %}is-current-page{% endif %}{% endif %}">
                   <a href="{{fullPathToArticle}}" class="pl-6 pr-5 py-1{% if forloop.last %} pb-2{% endif %}">{{ article[1].title }}</a>
@@ -58,7 +58,7 @@
       {% else %}
       <ul class="sidebar-articles list-style-none">
         {% for article in category[1].articles %}
-        {% capture fullPathToArticle %}/{{currentLanguage}}{{article[1].href}}{% endcapture %}
+        {% capture fullPathToArticle %}{{article[1].href}}{% endcapture %}
         <li class="sidebar-article {% if breadcrumbs.article.href == article[1].href %}active {% if currentPath == fullPathToArticle %}is-current-page{% endif %}{% endif %}">
           <a href="{{fullPathToArticle}}" class="pl-4 pr-5 py-1{% if forloop.last %} pb-2{% endif %}">{{ article[1].title }}</a>
         </li>
diff --git a/lib/find-page.js b/lib/find-page.js
index f859c6db9f..03e2b10c9a 100644
--- a/lib/find-page.js
+++ b/lib/find-page.js
@@ -8,6 +8,10 @@ module.exports = function findPage (href, pageMap, redirects = {}, languageCode
   // remove trailing slash
   href = slash(href).replace(patterns.trailingSlash, '$1')
 
+  // do an initial lookup on the path as-is
+  let page = pageMap[removeFragment(href)]
+  if (page) return page
+
   // check all potential versions
   const versionedPathsToCheck = [...new Set(allVersions.map(version => {
     return getVersionedPathWithLanguage(href, version, languageCode)
@@ -22,8 +26,8 @@ module.exports = function findPage (href, pageMap, redirects = {}, languageCode
   // need to account for redirects again
   pathToPage = redirects[pathToPage] || pathToPage
 
-  // find the page
-  const page = pageMap[removeFragment(pathToPage)]
+  // try finding the page again
+  page = pageMap[removeFragment(pathToPage)]
 
   if (page) return page
 
diff --git a/lib/get-map-topic-content.js b/lib/get-map-topic-content.js
index bb18544a2a..93b77aee9d 100644
--- a/lib/get-map-topic-content.js
+++ b/lib/get-map-topic-content.js
@@ -1,22 +1,12 @@
-const findPage = require('./find-page')
+// get the childArticles set on map topics in lib/site-tree.js
+module.exports = function getMapTopicContent (parentProductId, breadcrumbs, siteTree) {
+  const childArticles = siteTree.products[parentProductId].categories[breadcrumbs.category.href].maptopics[breadcrumbs.maptopic.href].childArticles
 
-// get the page.childArticles set on english map topics in lib/site-tree.js
-module.exports = function getMapTopicContent (page, pageMap, redirects) {
-  const englishPage = page.languageCode !== 'en'
-    ? findPage(`/${page.relativePath.replace(/.md$/, '')}`, pageMap, redirects, 'en')
-    : page
-
-  if (!englishPage) {
-    console.error(`cannot find english page: ${page.fullPath}`)
-    return
+  if (!childArticles) {
+    console.error(`can't find child articles from siteTree for map topic '${breadcrumbs.maptopic.href}'`)
   }
 
-  if (!englishPage.childArticles) {
-    console.error(`error getting child articles on map topic: ${page.fullPath}`)
-    return
-  }
-
-  return englishPage.childArticles
+  return childArticles
     .map(article => `{% link_with_intro /${article.href} %}`)
     .join('\n\n')
 }
diff --git a/lib/page.js b/lib/page.js
index b2850f8772..f9adabbe5c 100644
--- a/lib/page.js
+++ b/lib/page.js
@@ -148,7 +148,8 @@ class Page {
     this.shortTitle = await renderContent(this.shortTitle, context, { textOnly: true, encodeEntities: true })
 
     let markdown = this.mapTopic
-      ? getMapTopicContent(this, context.pages, context.redirects)
+      // get the map topic child articles from the siteTree
+      ? getMapTopicContent(this.parentProduct.id, context.breadcrumbs, context.siteTree[context.currentLanguage][context.currentVersion])
       : this.markdown
 
     // If the article is interactive parse the React!
diff --git a/lib/site-tree.js b/lib/site-tree.js
index 0cef06329f..894085627e 100644
--- a/lib/site-tree.js
+++ b/lib/site-tree.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const findPageInVersion = require('./find-page-in-version')
 const products = Object.values(require('../lib/all-products'))
-const { getVersionedPathWithoutLanguage } = require('./path-utils')
+const { getVersionedPathWithLanguage, getPathWithLanguage } = require('./path-utils')
 const languageCodes = Object.keys(require('./languages'))
 const addTitlesToTree = require('./site-tree-titles')
 const allVersions = Object.keys(require('./all-versions'))
@@ -35,7 +35,8 @@ module.exports = async function buildSiteTree (pageMap, site, redirects) {
           return
         }
 
-        product.href = item.href
+        // we don't want versioned product links because these links already have a default version in them
+        product.href = getPathWithLanguage(item.href, languageCode)
 
         // find the product TOC page and get TOC items
         const page = findPageInVersion(item.href, pageMap, redirects, languageCode, version)
@@ -43,7 +44,7 @@ module.exports = async function buildSiteTree (pageMap, site, redirects) {
         // skip if page can't be found in this version
         if (!page) return
 
-        product.categories = buildCategoriesTree(page.tocItems, item.href, pageMap, redirects, version, languageCode)
+        product.categories = buildCategoriesTree(page.tocItems, product.href, pageMap, redirects, version, languageCode)
 
         productTree[item.id] = product
         return null
@@ -67,11 +68,12 @@ function buildCategoriesTree (tocItems, productHref, pageMap, redirects, version
 
     const categoryHref = path.join(productHref, item.href)
 
-    const versionedCategoryHref = getVersionedPathWithoutLanguage(categoryHref, version)
+    // we DO want versioned category links
+    const versionedCategoryHref = getVersionedPathWithLanguage(categoryHref, version, languageCode)
     category.href = versionedCategoryHref
 
     // find the category TOC page and get its TOC items
-    const page = findPageInVersion(categoryHref, pageMap, redirects, languageCode, version)
+    const page = findPageInVersion(versionedCategoryHref, pageMap, redirects, languageCode, version)
 
     // skip if page can't be found in this version
     if (!page) return
@@ -90,9 +92,9 @@ function buildCategoriesTree (tocItems, productHref, pageMap, redirects, version
       // if TOC contains maptopics, build a maptopics tree
       // otherwise build an articles tree
       if (hasMaptopics) {
-        category.maptopics = buildMaptopicsTree(page.tocItems, categoryHref, pageMap, redirects, version, languageCode)
+        category.maptopics = buildMaptopicsTree(page.tocItems, versionedCategoryHref, pageMap, redirects, version, languageCode)
       } else {
-        category.articles = buildArticlesTree(page.tocItems, categoryHref, pageMap, redirects, version, languageCode)
+        category.articles = buildArticlesTree(page.tocItems, versionedCategoryHref, pageMap, redirects, version, languageCode)
       }
     }
 
@@ -102,7 +104,7 @@ function buildCategoriesTree (tocItems, productHref, pageMap, redirects, version
   return categoryTree
 }
 
-function buildMaptopicsTree (tocItems, categoryHref, pageMap, redirects, version, languageCode) {
+function buildMaptopicsTree (tocItems, versionedCategoryHref, pageMap, redirects, version, languageCode) {
   const maptopicTree = {}
 
   // for every maptopic in a category TOC...
@@ -111,14 +113,11 @@ function buildMaptopicsTree (tocItems, categoryHref, pageMap, redirects, version
     .forEach(item => {
       const maptopic = {}
 
-      const maptopicHref = path.join(categoryHref, item.href)
-
-      const versionedMaptopicHref = getVersionedPathWithoutLanguage(maptopicHref, version)
+      const versionedMaptopicHref = path.join(versionedCategoryHref, item.href)
       maptopic.href = versionedMaptopicHref
 
-      // we already have access to the child articles via the category TOC items
-      // but we still need the page to get the available versions
-      const page = findPageInVersion(maptopicHref, pageMap, redirects, languageCode, version)
+      // find the category TOC page and get its TOC items
+      const page = findPageInVersion(versionedMaptopicHref, pageMap, redirects, languageCode, version)
 
       // skip if page can't be found in this version
       if (!page) return
@@ -126,23 +125,20 @@ function buildMaptopicsTree (tocItems, categoryHref, pageMap, redirects, version
       // if this is not a maptopic, return early
       if (!page.mapTopic) return
 
-      const childArticles = getChildArticles(tocItems, item.href)
-
       maptopic.title = page.title
       maptopic.shortTitle = page.shortTitle
       maptopic.hidden = page.hidden
-
       // make the child articles accessible to the page object for maptopic rendering
-      if (!page.childArticles) page.childArticles = childArticles
+      maptopic.childArticles = getChildArticles(tocItems, item.href)
+      maptopic.articles = buildArticlesTree(maptopic.childArticles, versionedCategoryHref, pageMap, redirects, version, languageCode)
 
-      maptopic.articles = buildArticlesTree(childArticles, categoryHref, pageMap, redirects, version, languageCode)
       maptopicTree[versionedMaptopicHref] = maptopic
     })
 
   return maptopicTree
 }
 
-function buildArticlesTree (tocItems, categoryHref, pageMap, redirects, version, languageCode) {
+function buildArticlesTree (tocItems, versionedCategoryHref, pageMap, redirects, version, languageCode) {
   const articleTree = {}
 
   // REST categories may not have TOC items
@@ -152,12 +148,11 @@ function buildArticlesTree (tocItems, categoryHref, pageMap, redirects, version,
   tocItems.forEach(item => {
     const article = {}
 
-    const articleHref = path.join(categoryHref, item.href)
-
-    const versionedArticleHref = getVersionedPathWithoutLanguage(articleHref, version)
+    const versionedArticleHref = path.join(versionedCategoryHref, item.href)
     article.href = versionedArticleHref
 
-    const page = findPageInVersion(articleHref, pageMap, redirects, languageCode, version)
+    // find the category TOC page and get its TOC items
+    const page = findPageInVersion(versionedArticleHref, pageMap, redirects, languageCode, version)
 
     // skip if page can't be found in this version
     if (!page) return
diff --git a/middleware/breadcrumbs.js b/middleware/breadcrumbs.js
index 148ab2de52..7d5e16efe1 100644
--- a/middleware/breadcrumbs.js
+++ b/middleware/breadcrumbs.js
@@ -23,7 +23,7 @@ module.exports = async (req, res, next) => {
   const product = req.context.siteTree[req.language][req.context.currentVersion].products[req.context.currentProduct]
 
   req.context.breadcrumbs.product = {
-    href: path.posix.join('/', req.context.currentVersion, productPath),
+    href: path.posix.join('/', req.context.currentLanguage, req.context.currentVersion, productPath),
     title: product.title
   }
 
@@ -32,7 +32,7 @@ module.exports = async (req, res, next) => {
   // get category path
   // e.g., `getting-started-with-github` in /free-pro-team@latest/github/getting-started-with-github
   // or /enterprise-server@2.21/github/getting-started-with-github
-  const categoryPath = path.posix.join('/', req.context.currentVersion, productPath, pathParts[1])
+  const categoryPath = path.posix.join('/', req.context.currentLanguage, req.context.currentVersion, productPath, pathParts[1])
 
   const category = product.categories[categoryPath]
 
@@ -49,7 +49,7 @@ module.exports = async (req, res, next) => {
   // e.g., /github/getting-started-with-github/learning-about-github
   let maptopic
   if (req.context.page.mapTopic) {
-    const maptopicPath = path.posix.join(categoryPath, pathParts[2])
+    const maptopicPath = req.path
 
     maptopic = category.maptopics[maptopicPath]
 
@@ -60,9 +60,7 @@ module.exports = async (req, res, next) => {
       title: maptopic.shortTitle || maptopic.title
     }
   } else {
-    // get article path
-    // e.g., /github/getting-started-with-github/githubs-products
-    const articlePath = path.posix.join(categoryPath, pathParts[2])
+    const articlePath = req.path
 
     // find parent maptopic if one exists
     // some categories don't have maptopics, e.g. site-policy
@@ -77,17 +75,7 @@ module.exports = async (req, res, next) => {
       }
     }
 
-    let articleKey = '/' + req.language + articlePath
-    let articlePage = req.context.pages[articleKey]
-
-    // fall back to English if localized article does not exist
-    if (!articlePage && req.language !== 'en') {
-      articleKey = '/en' + articlePath
-      articlePage = req.context.pages[articleKey]
-    }
-
-    if (!articlePage) return next()
-
+    const articlePage = req.context.page
     const articleTitle = await articlePage.renderProp('shortTitle', req.context, { textOnly: true, encodeEntities: true })
 
     req.context.breadcrumbs.article = {
diff --git a/middleware/early-access-breadcrumbs.js b/middleware/early-access-breadcrumbs.js
index b0d2eb9087..a04cfc1118 100644
--- a/middleware/early-access-breadcrumbs.js
+++ b/middleware/early-access-breadcrumbs.js
@@ -40,8 +40,8 @@ module.exports = async (req, res, next) => {
 
   // get Early Access category path
   // e.g., `enforcing-best-practices-with-github-policies` in /free-pro-team@latest/early-access/github/enforcing-best-practices-with-github-policies
-  const categoryPath = path.posix.join('/', req.context.currentVersion, 'early-access', pathParts[0], pathParts[1])
-  const category = req.context.pages[path.posix.join('/en', categoryPath)]
+  const categoryPath = path.posix.join('/', 'en', req.context.currentVersion, 'early-access', pathParts[0], pathParts[1])
+  const category = req.context.pages[categoryPath]
 
   if (!category) return next()
 
@@ -54,7 +54,7 @@ module.exports = async (req, res, next) => {
 
   // for Early Access purposes, we don't need to differentiate between map topics and articles breadcrumbs
   const mapTopicOrArticlePath = path.posix.join(categoryPath, pathParts[2])
-  const mapTopicOrArticle = req.context.pages[path.posix.join('/en', mapTopicOrArticlePath)]
+  const mapTopicOrArticle = req.context.pages[mapTopicOrArticlePath]
 
   if (!mapTopicOrArticle) return next()
 
diff --git a/tests/content/site-tree.js b/tests/content/site-tree.js
index fd64445ec3..1f1d49ef33 100644
--- a/tests/content/site-tree.js
+++ b/tests/content/site-tree.js
@@ -24,23 +24,23 @@ describe('siteTree', () => {
   test('object order', () => {
     expect(Object.keys(siteTree)[0]).toBe('en')
     expect(Object.keys(siteTree.en)[0]).toBe(nonEnterpriseDefaultVersion)
-    expect(Object.keys(siteTree.en[nonEnterpriseDefaultVersion].products.github.categories)[0]).toBe(`/${nonEnterpriseDefaultVersion}/github/getting-started-with-github`)
+    expect(Object.keys(siteTree.en[nonEnterpriseDefaultVersion].products.github.categories)[0]).toBe(`/en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github`)
   })
 
   test('object structure', () => {
     expect(nonEnterpriseDefaultVersion in siteTree.en).toBe(true)
     expect(`enterprise-server@${latestEnterpriseRelease}` in siteTree.en).toBe(true)
-    expect(flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.href`]).toBe(`/${nonEnterpriseDefaultVersion}/github`)
-    expect(flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.categories./${nonEnterpriseDefaultVersion}/github/getting-started-with-github.href`]).toBe(`/${nonEnterpriseDefaultVersion}/github/getting-started-with-github`)
+    expect(flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.href`]).toBe(`/en/${nonEnterpriseDefaultVersion}/github`)
+    expect(flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.categories./en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github.href`]).toBe(`/en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github`)
   })
 
   describe('localized titles', () => {
     test('titles for categories', () => {
-      const japaneseTitle = flatTree[`ja.${nonEnterpriseDefaultVersion}.products.github.categories./${nonEnterpriseDefaultVersion}/github/getting-started-with-github.title`]
+      const japaneseTitle = flatTree[`ja.${nonEnterpriseDefaultVersion}.products.github.categories./ja/${nonEnterpriseDefaultVersion}/github/getting-started-with-github.title`]
       expect(typeof japaneseTitle).toBe('string')
       expect(japaneseCharacters.presentIn(japaneseTitle)).toBe(true)
 
-      const englishTitle = flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.categories./${nonEnterpriseDefaultVersion}/github/getting-started-with-github.title`]
+      const englishTitle = flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.categories./en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github.title`]
       expect(typeof englishTitle).toBe('string')
       expect(japaneseCharacters.presentIn(englishTitle)).toBe(false)
     })
@@ -52,7 +52,7 @@ describe('siteTree', () => {
     test('articles that include site data in liquid templating', () => {
       const pageWithDynamicTitle = siteTree.en[`enterprise-server@${latestEnterpriseRelease}`]
         .products.admin
-        .categories[`/enterprise-server@${latestEnterpriseRelease}/admin/enterprise-support`]
+        .categories[`/en/enterprise-server@${latestEnterpriseRelease}/admin/enterprise-support`]
       // Source frontmatter from article:
       // title: 'Working with {{ site.data.variables.contact.github_support }}'
       expect(pageWithDynamicTitle.title).toEqual('Working with GitHub Support')
diff --git a/tests/rendering/breadcrumbs.js b/tests/rendering/breadcrumbs.js
index 893685898c..4d5f4aa955 100644
--- a/tests/rendering/breadcrumbs.js
+++ b/tests/rendering/breadcrumbs.js
@@ -88,7 +88,7 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         }
       }
@@ -99,11 +99,11 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github/authenticating-to-github?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         },
         category: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
           title: 'Authentication'
         }
       }
@@ -114,15 +114,15 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github/authenticating-to-github/keeping-your-account-and-data-secure?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         },
         category: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
           title: 'Authentication'
         },
         maptopic: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/keeping-your-account-and-data-secure`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/keeping-your-account-and-data-secure`,
           title: 'Keeping your account and data secure'
         }
       }
@@ -133,19 +133,19 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github/authenticating-to-github/creating-a-strong-password?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         },
         category: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
           title: 'Authentication'
         },
         maptopic: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/keeping-your-account-and-data-secure`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/keeping-your-account-and-data-secure`,
           title: 'Keeping your account and data secure'
         },
         article: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/creating-a-strong-password`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/creating-a-strong-password`,
           title: 'Creating a strong password'
         }
       }
@@ -156,15 +156,15 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/github/site-policy/github-privacy-statement?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         },
         category: {
-          href: `/${nonEnterpriseDefaultVersion}/github/site-policy`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/site-policy`,
           title: 'Site policy'
         },
         article: {
-          href: `/${nonEnterpriseDefaultVersion}/github/site-policy/github-privacy-statement`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/site-policy/github-privacy-statement`,
           title: 'GitHub Privacy Statement'
         }
       }

From c859f853dc4520c6467adc7cf58f9c82b489b8e9 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Tue, 15 Dec 2020 11:52:53 -0500
Subject: [PATCH 14/40] refactor map topic module to not use breadcrumbs

---
 lib/get-map-topic-content.js | 25 ++++++++++++++++++++++---
 lib/page.js                  |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/lib/get-map-topic-content.js b/lib/get-map-topic-content.js
index 93b77aee9d..1d6d1aebe4 100644
--- a/lib/get-map-topic-content.js
+++ b/lib/get-map-topic-content.js
@@ -1,12 +1,31 @@
+const { get, last } = require('lodash')
+const { getLanguageCode } = require('../lib/patterns')
+
 // get the childArticles set on map topics in lib/site-tree.js
-module.exports = function getMapTopicContent (parentProductId, breadcrumbs, siteTree) {
-  const childArticles = siteTree.products[parentProductId].categories[breadcrumbs.category.href].maptopics[breadcrumbs.maptopic.href].childArticles
+module.exports = function getMapTopicContent (productId, siteTree, currentLanguage, currentVersion, currentPath) {
+  const maptopicPath = currentPath
+  const categoryPath = currentPath.replace(`/${last(currentPath.split('/'))}`, '')
+  const siteTreePath = getSiteTreePath(currentVersion, productId, categoryPath, maptopicPath)
+  let childArticles = get(siteTree[currentLanguage], siteTreePath)
+
+  // try falling back to English if needed
+  if (!childArticles && currentLanguage !== 'en') {
+    const englishCategoryPath = categoryPath.replace(getLanguageCode, '/en')
+    const englishMaptopicPath = maptopicPath.replace(getLanguageCode, '/en')
+    const englishSiteTreePath = getSiteTreePath(currentVersion, productId, englishCategoryPath, englishMaptopicPath)
+    childArticles = get(siteTree.en, englishSiteTreePath)
+  }
 
   if (!childArticles) {
-    console.error(`can't find child articles from siteTree for map topic '${breadcrumbs.maptopic.href}'`)
+    console.error('can\'t find child articles for map topic')
+    return ''
   }
 
   return childArticles
     .map(article => `{% link_with_intro /${article.href} %}`)
     .join('\n\n')
 }
+
+function getSiteTreePath (version, productId, categoryPath, maptopicPath) {
+  return [version, 'products', productId, 'categories', categoryPath, 'maptopics', maptopicPath, 'childArticles']
+}
diff --git a/lib/page.js b/lib/page.js
index f9adabbe5c..3289316cff 100644
--- a/lib/page.js
+++ b/lib/page.js
@@ -149,7 +149,7 @@ class Page {
 
     let markdown = this.mapTopic
       // get the map topic child articles from the siteTree
-      ? getMapTopicContent(this.parentProduct.id, context.breadcrumbs, context.siteTree[context.currentLanguage][context.currentVersion])
+      ? getMapTopicContent(this.parentProduct.id, context.siteTree, context.currentLanguage, context.currentVersion, context.currentPath)
       : this.markdown
 
     // If the article is interactive parse the React!

From 3dfd7a01af322338265a21ac5a295c54b0b2e1e1 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Tue, 15 Dec 2020 11:53:44 -0500
Subject: [PATCH 15/40] add test for unequal versions between category pages
 and child pages

---
 tests/content/category-pages.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/tests/content/category-pages.js b/tests/content/category-pages.js
index 218301846e..14cfaf512d 100644
--- a/tests/content/category-pages.js
+++ b/tests/content/category-pages.js
@@ -7,6 +7,7 @@ const GithubSlugger = require('github-slugger')
 const { XmlEntities } = require('html-entities')
 const loadSiteData = require('../../lib/site-data')
 const renderContent = require('../../lib/render-content')
+const getApplicableVersions = require('../../lib/get-applicable-versions')
 
 const slugger = new GithubSlugger()
 const entities = new XmlEntities()
@@ -25,7 +26,7 @@ describe('category pages', () => {
 
   const walkOptions = {
     globs: ['*/index.md', 'enterprise/*/index.md'],
-    ignore: ['{rest,graphql,developers}/**', 'enterprise/index.md', '**/articles/**', 'early-access/**'],
+    ignore: ['{rest,graphql}/**', 'enterprise/index.md', '**/articles/**', 'early-access/**'],
     directories: false,
     includeBasePath: true
   }
@@ -64,7 +65,8 @@ describe('category pages', () => {
       describe.each(categoryTuples)(
         'category index "%s"',
         (indexRelPath, indexAbsPath, indexLink) => {
-          let publishedArticlePaths, availableArticlePaths, indexTitle
+          let publishedArticlePaths, availableArticlePaths, indexTitle, categoryVersions
+          const articleVersions = {}
 
           beforeAll(async () => {
             const categoryDir = path.dirname(indexAbsPath)
@@ -72,6 +74,7 @@ describe('category pages', () => {
             // Get child article links included in each subdir's index page
             const indexContents = await fs.promises.readFile(indexAbsPath, 'utf8')
             const { data, content } = matter(indexContents)
+            categoryVersions = getApplicableVersions(data.versions, indexAbsPath)
             const articleLinks = getLinks(content)
 
             // Save the index title for later testing
@@ -108,6 +111,15 @@ describe('category pages', () => {
                 return `/${path.relative(categoryDir, articlePath).replace(/\.md$/, '')}`
               })
             )).filter(Boolean)
+
+            await Promise.all(
+              childFilePaths.map(async (articlePath) => {
+                const articleContents = await fs.promises.readFile(articlePath, 'utf8')
+                const { data } = matter(articleContents)
+
+                articleVersions[articlePath] = getApplicableVersions(data.versions, articlePath)
+              })
+            )
           })
 
           test('contains all expected articles', () => {
@@ -122,6 +134,14 @@ describe('category pages', () => {
             expect(unexpectedArticles.length, errorMessage).toBe(0)
           })
 
+          test('contains only articles and map topics with versions that are also available in the parent category', () => {
+            Object.entries(articleVersions).forEach(([articleName, articleVersions]) => {
+              const unexpectedVersions = difference(articleVersions, categoryVersions)
+              const errorMessage = `${articleName} has versions that are not available in parent category`
+              expect(unexpectedVersions.length, errorMessage).toBe(0)
+            })
+          })
+
           // TODO: Unskip this test once the related script has been executed
           test.skip('slugified title matches parent directory name', () => {
             // Get the parent directory name

From e458b76de68127b39560ececbeee41fb5abfe8aa Mon Sep 17 00:00:00 2001
From: Laura Coursen <lecoursen@github.com>
Date: Wed, 16 Dec 2020 14:50:10 -0600
Subject: [PATCH 16/40] Fix versioning for "GitHub Insights and data protection
 for your organization"

---
 ...github-insights-and-data-protection-for-your-organization.md | 2 +-
 .../about-data-in-github-insights.md                            | 2 +-
 .../installing-github-insights.md                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
index 52a69a7135..f4d835e8af 100644
--- a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
+++ b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
@@ -5,7 +5,7 @@ product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization
 versions:
-  enterprise-server: '*'
+  free-pro-team: '*'
 ---
 
 For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement.
diff --git a/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md b/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md
index ee319fad22..90bf3a0747 100644
--- a/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md
+++ b/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md
@@ -19,4 +19,4 @@ You can choose which contributors are included in metrics and create teams of co
 
 ### Further reading
 - "[Metrics available with {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)"
-- "[{% data variables.product.prodname_insights %} and data protection for your organization](/github/site-policy/github-insights-and-data-protection-for-your-organization)"
+- "<a href="/github/site-policy/github-insights-and-data-protection-for-your-organization" class="dotcom-only">{% data variables.product.prodname_insights %} and data protection for your organization</a>"
\ No newline at end of file
diff --git a/content/insights/installing-and-configuring-github-insights/installing-github-insights.md b/content/insights/installing-and-configuring-github-insights/installing-github-insights.md
index 228c43c784..5bc8e0c745 100644
--- a/content/insights/installing-and-configuring-github-insights/installing-github-insights.md
+++ b/content/insights/installing-and-configuring-github-insights/installing-github-insights.md
@@ -108,4 +108,4 @@ To configure {% data variables.product.prodname_insights %} to connect to {% dat
 ### Further reading
 
 - "[Managing repositories](/insights/installing-and-configuring-github-insights/managing-repositories)"
-- "[{% data variables.product.prodname_insights %} and data protection for your organization](/github/site-policy/github-insights-and-data-protection-for-your-organization)"
+- "<a href="/github/site-policy/github-insights-and-data-protection-for-your-organization" class="dotcom-only">{% data variables.product.prodname_insights %} and data protection for your organization</a>"

From 602c2f3633c2fa5f085e2e2d11ff2d757d2d5507 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 16 Dec 2020 16:06:00 -0500
Subject: [PATCH 17/40] Marketplace should be dotcom-only

---
 .../github-marketplace/creating-apps-for-github-marketplace.md   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/content/developers/github-marketplace/creating-apps-for-github-marketplace.md b/content/developers/github-marketplace/creating-apps-for-github-marketplace.md
index 9252c41ece..342754e94d 100644
--- a/content/developers/github-marketplace/creating-apps-for-github-marketplace.md
+++ b/content/developers/github-marketplace/creating-apps-for-github-marketplace.md
@@ -4,6 +4,5 @@ intro: 'You can list free and paid tools for developers to use in {% data variab
 mapTopic: true
 versions:
   free-pro-team: '*'
-  enterprise-server: '*'
 ---
 

From a32e2e32698c1b7ed2b6b96c9a208645de8c089e Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 16 Dec 2020 16:23:06 -0500
Subject: [PATCH 18/40] redirect from Enterprise versions of the page

---
 ...ithub-insights-and-data-protection-for-your-organization.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
index f4d835e8af..70d4eb12aa 100644
--- a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
+++ b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
@@ -4,6 +4,9 @@ intro: '{% data variables.product.prodname_insights %} analyzes your {% data var
 product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization
+  - /enterprise-server@2.22/github/site-policy/github-insights-and-data-protection-for-your-organization
+  - /enterprise-server@2.21/github/site-policy/github-insights-and-data-protection-for-your-organization
+  - /enterprise-server@2.20/github/site-policy/github-insights-and-data-protection-for-your-organization
 versions:
   free-pro-team: '*'
 ---

From 5762bbaad486bd0f76dd454f61152242ee94279d Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 16 Dec 2020 16:23:20 -0500
Subject: [PATCH 19/40] support hardcoded versions in frontmatter redirects

---
 lib/redirects/permalinks.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/redirects/permalinks.js b/lib/redirects/permalinks.js
index 1b3b846b19..d95c61e99e 100644
--- a/lib/redirects/permalinks.js
+++ b/lib/redirects/permalinks.js
@@ -1,5 +1,6 @@
 const patterns = require('../patterns')
-const { getVersionedPathWithLanguage } = require('../path-utils')
+const { getVersionedPathWithLanguage, getVersionStringFromPath } = require('../path-utils')
+const allVersions = Object.keys(require('../all-versions'))
 const getOldPathsFromPermalink = require('./get-old-paths-from-permalink')
 
 module.exports = function generateRedirectsForPermalinks (permalinks, redirectFrontmatter) {
@@ -25,6 +26,12 @@ module.exports = function generateRedirectsForPermalinks (permalinks, redirectFr
       // remove trailing slashes (sometimes present in frontmatter)
       frontmatterOldPath = frontmatterOldPath.replace(patterns.trailingSlash, '$1')
 
+      // support hardcoded versions in redirect frontmatter
+      if (allVersions.includes(getVersionStringFromPath(frontmatterOldPath))) {
+        redirects[frontmatterOldPath] = permalink.href
+        redirects[`/en${frontmatterOldPath}`] = permalink.href
+      }
+
       // get the old path for the current permalink version
       const versionedFrontmatterOldPath = getVersionedPathWithLanguage(frontmatterOldPath, permalink.pageVersion, permalink.languageCode)
 

From ff1e057429e366586ca544b6beafe005014a104b Mon Sep 17 00:00:00 2001
From: Jenn DeForest <42984983+jenndeforest@users.noreply.github.com>
Date: Wed, 16 Dec 2020 17:55:06 -0800
Subject: [PATCH 20/40] Update guidelines-for-legal-requests-of-user-data.md
 (#16756)

Remove legal@support.github.com email address from legal request guidelines

Co-authored-by: Melanie Yarbrough <11952755+myarb@users.noreply.github.com>
---
 .../site-policy/guidelines-for-legal-requests-of-user-data.md   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md b/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
index 110de95ccc..d80bbd16cc 100644
--- a/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
+++ b/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
@@ -216,8 +216,6 @@ c/o Corporation Service Company
 Sacramento, CA 95833-3505
 ```
 
-You may also send a courtesy copy to legal@support.github.com.
-
 Please make your requests as specific and narrow as possible, including the following information:
 
 - Full information about authority issuing the request for information

From 05ecacaa933aef0c4f6772bea8d32905004fc72e Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 16 Dec 2020 21:24:26 -0500
Subject: [PATCH 21/40] change external /contact link to contact variable

---
 .../managing-your-subscriptions.md                              | 2 +-
 .../watching-and-unwatching-repositories.md                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md b/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md
index e1a631af52..a0a9f79168 100644
--- a/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md
+++ b/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md
@@ -11,7 +11,7 @@ To help you understand your subscriptions and decide whether to unsubscribe, see
 
 {% note %}
 
-**Note:** Instead of unsubscribing, you have the option to ignore a repository. If you ignore a repository, you won't receive any notifications. We don't recommend ignoring repositories as you won't be notified if you're @mentioned. {% if currentVersion == "free-pro-team@latest" %}If you're experiencing abuse and want to ignore a repository, please [contact support](/contact) so we can help. {% data reusables.policies.abuse %}{% endif %}
+**Note:** Instead of unsubscribing, you have the option to ignore a repository. If you ignore a repository, you won't receive any notifications. We don't recommend ignoring repositories as you won't be notified if you're @mentioned. {% if currentVersion == "free-pro-team@latest" %}If you're experiencing abuse and want to ignore a repository, please contact {% data variables.contact.contact_support %} so we can help. {% data reusables.policies.abuse %}{% endif %}
 
 {% endnote %}
 
diff --git a/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md b/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md
index 831b6f6936..716fb5541a 100644
--- a/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md
+++ b/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md
@@ -39,7 +39,7 @@ You can also watch and unwatch releases in a repository. For more information, s
 
 {% note %}
 
-**Note:** You can also choose to ignore a repository. If you ignore a repository, you won't receive any notifications. We don't recommend ignoring repositories as you won't be notified if you're @mentioned. {% if currentVersion == "free-pro-team@latest" %}If you experiencing abuse and want to ignore a repository, please [contact support](/contact) so we can help. {% data reusables.policies.abuse %}{% endif %}
+**Note:** You can also choose to ignore a repository. If you ignore a repository, you won't receive any notifications. We don't recommend ignoring repositories as you won't be notified if you're @mentioned. {% if currentVersion == "free-pro-team@latest" %}If you experiencing abuse and want to ignore a repository, please contact {% data variables.contact.contact_support %} so we can help. {% data reusables.policies.abuse %}{% endif %}
 
 {% endnote %}
 

From 8d84a90e6fa9b532fa6c36aceef345882a82b4c2 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Wed, 16 Dec 2020 21:24:50 -0500
Subject: [PATCH 22/40] do more path checking

---
 lib/path-utils.js | 51 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/lib/path-utils.js b/lib/path-utils.js
index 02e75aab1d..cd5077a170 100644
--- a/lib/path-utils.js
+++ b/lib/path-utils.js
@@ -4,6 +4,8 @@ const patterns = require('./patterns')
 const { deprecated } = require('./enterprise-server-releases')
 const allProducts = require('./all-products')
 const allVersions = require('./all-versions')
+const supportedVersions = Object.keys(allVersions)
+const supportedPlans = Object.values(allVersions).map(v => v.plan)
 const { getNewVersionedPath } = require('./old-versions-utils')
 
 // construct appropriate versioned path for any given HREF
@@ -22,10 +24,13 @@ function getVersionedPathWithoutLanguage (href, version) {
   // example: enterprise-server@2.22 or free-pro-team@latest
   let versionFromPath = getVersionStringFromPath(href)
 
-  // if the version found is not a currently supported version...
+  // update the path with the full version so we can go through the rest of the checks
+  href = href.replace(href.split('/')[1], versionFromPath)
+
+  // if the version found is NOT a currently supported version...
   let productObjectFromPath
-  if (!Object.keys(allVersions).includes(versionFromPath)) {
-    // first check if the first segment is instead a current product;
+  if (![...supportedPlans, ...supportedVersions, 'enterprise-server@latest'].includes(versionFromPath)) {
+  // first check if the first segment is instead a current product;
     // example: /admin/foo or /desktop/foo
     productObjectFromPath = allProducts[versionFromPath]
 
@@ -78,26 +83,45 @@ function getPathWithoutLanguage (href) {
   return slash(newHref)
 }
 
+// Remove the version segment from the path
 function getPathWithoutVersion (href) {
   return href.replace(`/${getVersionStringFromPath(href)}`, '')
 }
 
+// Return the version segment in a path
 function getVersionStringFromPath (href) {
   href = getPathWithoutLanguage(href)
-  const versionString = href.split('/')[1]
 
-  return versionString || 'homepage'
+  const versionFromPath = href.split('/')[1]
+
+  // return checkVersionFromPath(href.split('/')[1], href)
+  if (allVersions[versionFromPath]) {
+    return versionFromPath
+  }
+
+  // if the version segment is the latest enterprise-server release, return the latest release
+  if (versionFromPath === 'enterprise-server@latest') {
+    const enterpriseServerObject = Object.values(allVersions).find(v => v.plan === 'enterprise-server')
+    return allVersions[enterpriseServerObject.latestVersion].version
+  }
+
+  // if it's just a plan with no @release, find the plan's latest release
+  const planObject = Object.values(allVersions).find(v => v.plan === versionFromPath)
+  if (planObject) {
+    return allVersions[planObject.latestVersion].version
+  }
+
+  return versionFromPath || 'homepage'
 }
 
+// Return the corresponding object for the version segment in a path
 function getVersionObjectFromPath (href) {
-  const versionId = getVersionStringFromPath(href)
-  const version = allVersions[versionId]
+  const versionFromPath = getVersionStringFromPath(href)
 
-  if (!version) throw new Error(`No version found for ${href}`)
-
-  return version
+  return allVersions[versionFromPath]
 }
 
+// Return the product segment from the path
 function getProductStringFromPath (href) {
   href = getPathWithoutLanguage(href)
   const productString = href.split('/')[2]
@@ -105,10 +129,11 @@ function getProductStringFromPath (href) {
   return productString || 'homepage'
 }
 
+// Return the corresponding object for the product segment in a path
 function getProductObjectFromPath (href) {
-  const productId = getProductStringFromPath(href)
-  // Return undefined if product id derived from path can't be found in allProducts
-  return allProducts[productId]
+  const productFromPath = getProductStringFromPath(href)
+
+  return allProducts[productFromPath]
 }
 
 module.exports = {

From 51a4b9afbb14191ba32d7e83c8122c2f700820ea Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Thu, 17 Dec 2020 09:59:05 -0500
Subject: [PATCH 23/40] fix double slash typo in links

---
 .../github/authenticating-to-github/authorizing-oauth-apps.md   | 2 +-
 .../connecting-with-third-party-applications.md                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/github/authenticating-to-github/authorizing-oauth-apps.md b/content/github/authenticating-to-github/authorizing-oauth-apps.md
index a63b81f180..dca4ac4c69 100644
--- a/content/github/authenticating-to-github/authorizing-oauth-apps.md
+++ b/content/github/authenticating-to-github/authorizing-oauth-apps.md
@@ -38,7 +38,7 @@ When an {% data variables.product.prodname_oauth_app %} wants to identify you by
 
 *Scopes* are named groups of permissions that an {% data variables.product.prodname_oauth_app %} can request to access both public and non-public data.
 
-When you want to use an {% data variables.product.prodname_oauth_app %} that integrates with {% data variables.product.product_name %}, that app lets you know what type of access to your data will be required. If you grant access to the app, then the app will be able to perform actions on your behalf, such as reading or modifying data. For example, if you want to use an app that requests `user:email` scope, the app will have read-only access to your private email addresses. For more information, see "[About scopes for {% data variables.product.prodname_oauth_app %}s](//apps/building-integrations/setting-up-and-registering-oauth-apps/about-scopes-for-oauth-apps)."
+When you want to use an {% data variables.product.prodname_oauth_app %} that integrates with {% data variables.product.product_name %}, that app lets you know what type of access to your data will be required. If you grant access to the app, then the app will be able to perform actions on your behalf, such as reading or modifying data. For example, if you want to use an app that requests `user:email` scope, the app will have read-only access to your private email addresses. For more information, see "[About scopes for {% data variables.product.prodname_oauth_app %}s](/apps/building-integrations/setting-up-and-registering-oauth-apps/about-scopes-for-oauth-apps)."
 
 {% tip %}
 
diff --git a/content/github/authenticating-to-github/connecting-with-third-party-applications.md b/content/github/authenticating-to-github/connecting-with-third-party-applications.md
index e792daf5ec..5af7c4e731 100644
--- a/content/github/authenticating-to-github/connecting-with-third-party-applications.md
+++ b/content/github/authenticating-to-github/connecting-with-third-party-applications.md
@@ -32,7 +32,7 @@ Applications can have *read* or *write* access to your {% data variables.product
 
 *Scopes* are named groups of permissions that an application can request to access both public and non-public data.
 
-When you want to use a third-party application that integrates with {% data variables.product.product_name %}, that application lets you know what type of access to your data will be required. If you grant access to the application, then the application will be able to perform actions on your behalf, such as reading or modifying data. For example, if you want to use an app that requests `user:email` scope, the app will have read-only access to your private email addresses. For more information, see "[About scopes for {% data variables.product.prodname_oauth_app %}s](//apps/building-integrations/setting-up-and-registering-oauth-apps/about-scopes-for-oauth-apps)."
+When you want to use a third-party application that integrates with {% data variables.product.product_name %}, that application lets you know what type of access to your data will be required. If you grant access to the application, then the application will be able to perform actions on your behalf, such as reading or modifying data. For example, if you want to use an app that requests `user:email` scope, the app will have read-only access to your private email addresses. For more information, see "[About scopes for {% data variables.product.prodname_oauth_app %}s](/apps/building-integrations/setting-up-and-registering-oauth-apps/about-scopes-for-oauth-apps)."
 
 {% tip %}
 

From 78895184a7ddd7d8fd9cecbcb287312f903b44cb Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Thu, 17 Dec 2020 10:19:44 -0500
Subject: [PATCH 24/40] updates for clarity

---
 lib/path-utils.js              | 22 +++++++++++++++-------
 tests/helpers/links-checker.js |  4 +++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/path-utils.js b/lib/path-utils.js
index 3896baeaa6..43b08fd4c2 100644
--- a/lib/path-utils.js
+++ b/lib/path-utils.js
@@ -1,7 +1,7 @@
 const slash = require('slash')
 const path = require('path')
 const patterns = require('./patterns')
-const { deprecated } = require('./enterprise-server-releases')
+const { deprecated, latest } = require('./enterprise-server-releases')
 const allProducts = require('./all-products')
 const allVersions = require('./all-versions')
 const supportedVersions = new Set(Object.keys(allVersions))
@@ -23,7 +23,7 @@ function getVersionedPathWithoutLanguage (href, version) {
   // example: enterprise-server@2.22 or free-pro-team@latest
   let versionFromPath = getVersionStringFromPath(href)
 
-  // update the path with the full version so we can go through the rest of the checks
+  // if a real version was found, add it to the path so we can go through the rest of the checks
   if (supportedVersions.has(versionFromPath)) {
     href = href.replace(href.split('/')[1], versionFromPath)
   }
@@ -36,6 +36,7 @@ function getVersionedPathWithoutLanguage (href, version) {
     productObjectFromPath = allProducts[versionFromPath]
 
     // if so, add the first supported version for that product to the href
+    // (this is just to get a path with all the expected segments; the version will be updated later if needed)
     if (productObjectFromPath) {
       href = path.join('/', productObjectFromPath.versions[0], href)
       versionFromPath = productObjectFromPath.versions[0]
@@ -89,25 +90,32 @@ function getPathWithoutVersion (href) {
 function getVersionStringFromPath (href) {
   href = getPathWithoutLanguage(href)
 
+  // return immediately if this is a link to the homepage
+  if (href === '/') {
+    return 'homepage'
+  }
+
+  // check if the first segment is a supported version
   const versionFromPath = href.split('/')[1]
 
-  if (allVersions[versionFromPath]) {
+  if (supportedVersions.has(versionFromPath)) {
     return versionFromPath
   }
 
   // if the version segment is the latest enterprise-server release, return the latest release
   if (versionFromPath === 'enterprise-server@latest') {
-    const enterpriseServerObject = Object.values(allVersions).find(v => v.plan === 'enterprise-server')
-    return allVersions[enterpriseServerObject.latestVersion].version
+    return `enterprise-server@${latest}`
   }
 
-  // if it's just a plan with no @release, find the plan's latest release
+  // if it's just a plan with no @release (e.g., `enterprise-server`), return the latest release
   const planObject = Object.values(allVersions).find(v => v.plan === versionFromPath)
   if (planObject) {
     return allVersions[planObject.latestVersion].version
   }
 
-  return versionFromPath || 'homepage'
+  // otherwise, return the first segment as-is, which may not be a proper version
+  // but additional checks are done on this segment in getVersionedPathWithoutLanguage
+  return versionFromPath
 }
 
 // Return the corresponding object for the version segment in a path
diff --git a/tests/helpers/links-checker.js b/tests/helpers/links-checker.js
index ca69d76644..815823c8ba 100644
--- a/tests/helpers/links-checker.js
+++ b/tests/helpers/links-checker.js
@@ -145,8 +145,10 @@ class LinksChecker {
         if (gheVersionInLink && deprecated.includes(gheVersionInLink[1])) continue
         // ------ END ONEOFF EXCLUSIONS -------///
 
-        // look for linked page
+        // the link at this point should include a version via lib/rewrite-local-links
         const versionFromHref = getVersionStringFromPath(link)
+
+        // look for linked page
         const linkedPage = findPageInVersion(link, context.pages, context.redirects, this.languageCode, versionFromHref)
         this.checkedLinksCache.add(link)
 

From ae9beaae5bb0f0300ec71136b3894e0f4d8a59f6 Mon Sep 17 00:00:00 2001
From: Chiedo John <2156688+chiedo@users.noreply.github.com>
Date: Thu, 17 Dec 2020 10:25:40 -0500
Subject: [PATCH 25/40] Remove DE language from staging (#17038)

Co-authored-by: chiedo <chiedo@users.noreply.github.com>
---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index ce6f572a46..d7fa376e93 100644
--- a/app.json
+++ b/app.json
@@ -3,7 +3,7 @@
   "env": {
     "NODE_ENV": "production",
     "NPM_CONFIG_PRODUCTION": "true",
-    "ENABLED_LANGUAGES": "en, de"
+    "ENABLED_LANGUAGES": "en"
   },
   "buildpacks": [
     { "url": "https://github.com/DataDog/heroku-buildpack-datadog.git#1.21" },

From 4262cae231e42bc959662aa248f08c56520bdf13 Mon Sep 17 00:00:00 2001
From: Chiedo John <2156688+chiedo@users.noreply.github.com>
Date: Thu, 17 Dec 2020 10:42:46 -0500
Subject: [PATCH 26/40] Remove DataDog from Staging (#17036)

Remove DataDog from staging

Co-authored-by: chiedo <chiedo@users.noreply.github.com>
---
 app.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app.json b/app.json
index d7fa376e93..4373896fff 100644
--- a/app.json
+++ b/app.json
@@ -6,7 +6,6 @@
     "ENABLED_LANGUAGES": "en"
   },
   "buildpacks": [
-    { "url": "https://github.com/DataDog/heroku-buildpack-datadog.git#1.21" },
     { "url": "heroku/nodejs" }
   ],
   "formation": {

From 75deecd386e22a1f39b6f215aaa12dcccdc4716a Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Thu, 17 Dec 2020 10:50:52 -0500
Subject: [PATCH 27/40] add some clarifying comments

---
 lib/path-utils.js | 49 ++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/lib/path-utils.js b/lib/path-utils.js
index 43b08fd4c2..d20a800ebc 100644
--- a/lib/path-utils.js
+++ b/lib/path-utils.js
@@ -7,41 +7,46 @@ const allVersions = require('./all-versions')
 const supportedVersions = new Set(Object.keys(allVersions))
 const { getNewVersionedPath } = require('./old-versions-utils')
 
-// construct appropriate versioned path for any given HREF
+// This function constructs an appropriate versioned path for any given HREF.
+// NOTE: this gets called by findPage and various other functions, and
+// has to return a proper versioned link given a wide variety of incoming
+// modern or legacy-formatted links, so it is somewhat overloaded. At some point
+// this could probably be broken up into separate functions to handle different incoming
+// paths. But it is currently optimized to handle lots of edge cases.
 function getVersionedPathWithoutLanguage (href, version) {
-  // start clean without language code or trailing slash
+  // Start clean without language code or trailing slash
   href = getPathWithoutLanguage(href.replace(patterns.trailingSlash, '$1'))
 
-  // if this is an old versioned path that includes a deprecated version, do not change!
+  // If this is an old versioned path that includes a deprecated version, do not change!
   // example: /enterprise/11.10.340/admin/articles/upgrading-to-the-latest-release
   const oldEnterpriseVersionNumber = href.match(patterns.getEnterpriseVersionNumber)
   if (oldEnterpriseVersionNumber && deprecated.includes(oldEnterpriseVersionNumber[1])) {
     return href
   }
 
-  // try to derive the current version from the path
+  // Try to derive the current version from the path
   // example: enterprise-server@2.22 or free-pro-team@latest
   let versionFromPath = getVersionStringFromPath(href)
 
-  // if a real version was found, add it to the path so we can go through the rest of the checks
+  // If a supported version was found, add it to the path so we can go through the rest of the checks
   if (supportedVersions.has(versionFromPath)) {
     href = href.replace(href.split('/')[1], versionFromPath)
   }
 
-  // if the version found is NOT a currently supported version...
+  // If a currently supported version was NOT found...
   let productObjectFromPath
   if (!supportedVersions.has(versionFromPath)) {
-    // first check if the first segment is instead a current product;
+    // First check if the segment is instead a current product;
     // example: /admin/foo or /desktop/foo
     productObjectFromPath = allProducts[versionFromPath]
 
-    // if so, add the first supported version for that product to the href
+    // If so, add the first supported version for that product to the href
     // (this is just to get a path with all the expected segments; the version will be updated later if needed)
     if (productObjectFromPath) {
       href = path.join('/', productObjectFromPath.versions[0], href)
       versionFromPath = productObjectFromPath.versions[0]
     } else {
-      // otherwise, this may be an old path that should be converted to new path;
+      // Otherwise, this may be an old path that should be converted to new path;
       // OLD: /enterprise/2.22/admin/installation OR /enterprise/admin/installation
       // NEW: /enterprise-server@2.22/admin/installation
       href = getNewVersionedPath(href)
@@ -49,34 +54,34 @@ function getVersionedPathWithoutLanguage (href, version) {
     }
   }
 
-  // if not previously found, derive the product object from the path (e.g., github or admin)
+  // If not previously found, derive the product object from the path (e.g., github or admin)
   if (!productObjectFromPath) {
     productObjectFromPath = getProductObjectFromPath(href)
   }
 
-  // if the product's versions don't include the specified version, nothing to change!
+  // If the product's versions don't include the specified version, nothing to change!
   if (productObjectFromPath && !productObjectFromPath.versions.includes(version)) {
     return slash(href)
   }
 
-  // update the version
+  // Update the version and return the path
   return slash(href.replace(versionFromPath, version))
 }
 
-// add language code
+// Add language code to a versioned path
 function getVersionedPathWithLanguage (href, version, languageCode) {
   return getPathWithLanguage(getVersionedPathWithoutLanguage(href, version), languageCode)
 }
 
-// add the language to the given HREF
-// /en/articles/foo -> /articles/foo
+// Add the language to the given HREF
+// /articles/foo -> /en/articles/foo
 function getPathWithLanguage (href, languageCode) {
   return slash(path.posix.join('/', languageCode, getPathWithoutLanguage(href)))
     .replace(patterns.trailingSlash, '$1')
 }
 
-// remove the language from the given HREF
-// /articles/foo -> /en/articles/foo
+// Remove the language from the given HREF
+// /en/articles/foo -> /articles/foo
 function getPathWithoutLanguage (href) {
   return slash(href.replace(patterns.hasLanguageCode, '/'))
 }
@@ -90,30 +95,30 @@ function getPathWithoutVersion (href) {
 function getVersionStringFromPath (href) {
   href = getPathWithoutLanguage(href)
 
-  // return immediately if this is a link to the homepage
+  // Return immediately if this is a link to the homepage
   if (href === '/') {
     return 'homepage'
   }
 
-  // check if the first segment is a supported version
+  // Check if the first segment is a supported version
   const versionFromPath = href.split('/')[1]
 
   if (supportedVersions.has(versionFromPath)) {
     return versionFromPath
   }
 
-  // if the version segment is the latest enterprise-server release, return the latest release
+  // If the version segment is the latest enterprise-server release, return the latest release
   if (versionFromPath === 'enterprise-server@latest') {
     return `enterprise-server@${latest}`
   }
 
-  // if it's just a plan with no @release (e.g., `enterprise-server`), return the latest release
+  // If it's just a plan with no @release (e.g., `enterprise-server`), return the latest release
   const planObject = Object.values(allVersions).find(v => v.plan === versionFromPath)
   if (planObject) {
     return allVersions[planObject.latestVersion].version
   }
 
-  // otherwise, return the first segment as-is, which may not be a proper version
+  // Otherwise, return the first segment as-is, which may not be a real supported version,
   // but additional checks are done on this segment in getVersionedPathWithoutLanguage
   return versionFromPath
 }

From d31d89c62bf2b2f229c671abd39d9c3c0480cfa7 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Thu, 17 Dec 2020 10:51:07 -0500
Subject: [PATCH 28/40] borrow initial findPage lookup from #16965

---
 lib/find-page.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/find-page.js b/lib/find-page.js
index f859c6db9f..03e2b10c9a 100644
--- a/lib/find-page.js
+++ b/lib/find-page.js
@@ -8,6 +8,10 @@ module.exports = function findPage (href, pageMap, redirects = {}, languageCode
   // remove trailing slash
   href = slash(href).replace(patterns.trailingSlash, '$1')
 
+  // do an initial lookup on the path as-is
+  let page = pageMap[removeFragment(href)]
+  if (page) return page
+
   // check all potential versions
   const versionedPathsToCheck = [...new Set(allVersions.map(version => {
     return getVersionedPathWithLanguage(href, version, languageCode)
@@ -22,8 +26,8 @@ module.exports = function findPage (href, pageMap, redirects = {}, languageCode
   // need to account for redirects again
   pathToPage = redirects[pathToPage] || pathToPage
 
-  // find the page
-  const page = pageMap[removeFragment(pathToPage)]
+  // try finding the page again
+  page = pageMap[removeFragment(pathToPage)]
 
   if (page) return page
 

From 92d85b8d4a2542d26101110a1fabee80d6636c86 Mon Sep 17 00:00:00 2001
From: Shati Patel <42641846+shati-patel@users.noreply.github.com>
Date: Thu, 17 Dec 2020 15:58:26 +0000
Subject: [PATCH 29/40] Code scanning docs: small fixes (#17035)

---
 .../running-codeql-code-scanning-in-your-ci-system.md         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md
index 3c26119a81..79fdf066f1 100644
--- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md
+++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md
@@ -53,7 +53,7 @@ On Windows, the `codeql-runner-win.exe` file usually requires no change to permi
 Once you have downloaded the {% data variables.product.prodname_codeql_runner %} and verified that it can be executed, you should make the runner available to each CI server that you intend to use for {% data variables.product.prodname_code_scanning %}. It is important to notice that each CI server that you intend to use for {% data variables.product.prodname_code_scanning %} needs to have the {% data variables.product.prodname_codeql_runner %}. You might configure each server to copy the runner from a central, internal location, or you could use the REST API to get the runner direct from GitHub, for example: 
 
 ```shell
-wget https://github.com/github/codeql-action/releases/download/codeql-bundle-20200826/codeql-runner-linux 
+wget https://github.com/github/codeql-action/releases/latest/download/codeql-runner-linux
 chmod +x codeql-runner-linux
 ```
 
@@ -127,7 +127,7 @@ This example is similar to the previous example, however this time the repositor
     > ...
     > CodeQL environment output to "/srv/checkout/example-repo-2/codeql-runner/codeql-env.json"
       and "/srv/checkout/example-repo-2/codeql-runner/codeql-env.sh".
-      Please export these variables to future processes so the build can be traced, for example by running "
+      Please export these variables to future processes so that CodeQL can monitor the build, for example by running "
       . /srv/checkout/example-repo-2/codeql-runner/codeql-env.sh".
       ```
 

From d6e854b6b3c53746f23089bbb568b1bb699f85c2 Mon Sep 17 00:00:00 2001
From: Rachael Sewell <rachmari@github.com>
Date: Thu, 17 Dec 2020 08:18:45 -0800
Subject: [PATCH 30/40] update branch when out of date (#17031)

* update branch when out of date

* small copy update

* var rename

* lint yaml
---
 .github/workflows/repo-sync.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml
index 1788af7f96..804633901b 100644
--- a/.github/workflows/repo-sync.yml
+++ b/.github/workflows/repo-sync.yml
@@ -70,6 +70,33 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           number: ${{ steps.find-pull-request.outputs.number }}
 
+      # There are cases where the branch becomes out-of-date in between the time this workflow began and when the pull request is created/updated
+      - name: Update branch
+        uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const mainHeadSha = await github.git.getRef({
+              ...context.repo,
+              ref: 'heads/main'
+            })
+            console.log(`heads/main sha: ${mainHeadSha.data.object.sha}`)
+
+            const pull = await github.pulls.get({
+              ...context.repo,
+              pull_number: ${{ steps.find-pull-request.outputs.number }}
+            })
+
+            if (mainHeadSha.data.object.sha !== pull.data.base.sha) {
+              const updateBranch = await github.pulls.updateBranch({
+                ...context.repo,
+                pull_number: ${{ steps.find-pull-request.outputs.number }}
+              })
+              console.log(updateBranch.data.message)
+            } else {
+              console.log(`Branch is already up-to-date`)
+            }
+
       - name: Send Slack notification if workflow fails
         uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
         if: failure()

From 185737342e6ba1e258fd06c21591edd3aae29b30 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Thu, 17 Dec 2020 12:02:28 -0500
Subject: [PATCH 31/40] the new map topic handling now needs
 context.currentPath

---
 tests/helpers/links-checker.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/helpers/links-checker.js b/tests/helpers/links-checker.js
index 815823c8ba..97cfcb2de8 100644
--- a/tests/helpers/links-checker.js
+++ b/tests/helpers/links-checker.js
@@ -237,7 +237,8 @@ async function buildPathContext (initialContext, page, permalink) {
   const pathContext = {
     page,
     currentVersion: permalink.pageVersion,
-    relativePath: permalink.relativePath
+    relativePath: permalink.relativePath,
+    currentPath: permalink.href
   }
 
   // Combine it with the initial context object that has pages, redirects, etc.

From afbd4b7ce4789210be6cad1a617024a117db2d86 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Thu, 17 Dec 2020 12:03:22 -0500
Subject: [PATCH 32/40] we need to use a regex so we can be sure we are
 removing the final segment of the path... apparently this is still faster
 than a split/slice/join

---
 lib/get-map-topic-content.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/get-map-topic-content.js b/lib/get-map-topic-content.js
index 1d6d1aebe4..6735d43fe2 100644
--- a/lib/get-map-topic-content.js
+++ b/lib/get-map-topic-content.js
@@ -4,7 +4,7 @@ const { getLanguageCode } = require('../lib/patterns')
 // get the childArticles set on map topics in lib/site-tree.js
 module.exports = function getMapTopicContent (productId, siteTree, currentLanguage, currentVersion, currentPath) {
   const maptopicPath = currentPath
-  const categoryPath = currentPath.replace(`/${last(currentPath.split('/'))}`, '')
+  const categoryPath = currentPath.replace(new RegExp(`/${last(currentPath.split('/'))}$`), '')
   const siteTreePath = getSiteTreePath(currentVersion, productId, categoryPath, maptopicPath)
   let childArticles = get(siteTree[currentLanguage], siteTreePath)
 
@@ -17,7 +17,7 @@ module.exports = function getMapTopicContent (productId, siteTree, currentLangua
   }
 
   if (!childArticles) {
-    console.error('can\'t find child articles for map topic')
+    console.error(`can\'t find child articles for map topic ${currentPath}`)
     return ''
   }
 

From 1aa80996e0c426043f733227dbb60817f9f6b32e Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Thu, 17 Dec 2020 12:03:45 -0500
Subject: [PATCH 33/40] try to make this check as fast as we can

---
 lib/redirects/permalinks.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/redirects/permalinks.js b/lib/redirects/permalinks.js
index d95c61e99e..7e6840f5e1 100644
--- a/lib/redirects/permalinks.js
+++ b/lib/redirects/permalinks.js
@@ -1,6 +1,6 @@
 const patterns = require('../patterns')
 const { getVersionedPathWithLanguage, getVersionStringFromPath } = require('../path-utils')
-const allVersions = Object.keys(require('../all-versions'))
+const supportedVersions = new Set(Object.keys(require('../all-versions')))
 const getOldPathsFromPermalink = require('./get-old-paths-from-permalink')
 
 module.exports = function generateRedirectsForPermalinks (permalinks, redirectFrontmatter) {
@@ -27,7 +27,7 @@ module.exports = function generateRedirectsForPermalinks (permalinks, redirectFr
       frontmatterOldPath = frontmatterOldPath.replace(patterns.trailingSlash, '$1')
 
       // support hardcoded versions in redirect frontmatter
-      if (allVersions.includes(getVersionStringFromPath(frontmatterOldPath))) {
+      if (supportedVersions.has(frontmatterOldPath.split('/')[1])) {
         redirects[frontmatterOldPath] = permalink.href
         redirects[`/en${frontmatterOldPath}`] = permalink.href
       }

From cedab432dfa865e47926f0741242db4e31c17b8c Mon Sep 17 00:00:00 2001
From: Rimas Silkaitis <neovintage@github.com>
Date: Thu, 17 Dec 2020 09:06:12 -0800
Subject: [PATCH 34/40] Changes to Code Search & what data stays in the index
 (#16882)

* Update searching-code.md

* Update searching-code.md

Change only applies to github.com not GHES.

Co-authored-by: Laura Coursen <lecoursen@github.com>
---
 .../searching-for-information-on-github/searching-code.md      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/github/searching-for-information-on-github/searching-code.md b/content/github/searching-for-information-on-github/searching-code.md
index a7fc87e911..f03e26fb17 100644
--- a/content/github/searching-for-information-on-github/searching-code.md
+++ b/content/github/searching-for-information-on-github/searching-code.md
@@ -27,7 +27,8 @@ Due to the complexity of searching code, there are some restrictions on how sear
 - Only the _default branch_ is indexed for code search.{% if currentVersion == "free-pro-team@latest" %}
 - Only files smaller than 384 KB are searchable.{% else %}* Only files smaller than 5 MB are searchable.
 - Only the first 500 KB of each file is searchable.{% endif %}
-- Only repositories with fewer than 500,000 files are searchable.
+- Only repositories with fewer than 500,000 files are searchable.{% if currentVersion == "free-pro-team@latest" %}
+- Only repositories that have had activity or have been returned in search results in the last year are searchable.{% endif %}
 - Except with [`filename`](#search-by-filename) searches, you must always include at least one search term when searching source code. For example, searching for [`language:javascript`](https://github.com/search?utf8=%E2%9C%93&q=language%3Ajavascript&type=Code&ref=searchresults) is not valid, while [`amazing language:javascript`](https://github.com/search?utf8=%E2%9C%93&q=amazing+language%3Ajavascript&type=Code&ref=searchresults) is.
 - At most, search results can show two fragments from the same file, but there may be more results within the file.
 - You can't use the following wildcard characters as part of your search query: <code>. , : ; / \ ` ' " = * ! ? # $ & + ^ | ~ < > ( ) { } [ ]</code>. The search will simply ignore these symbols.

From ee7b67bbb5feea7c0b493cd1742e66762360d717 Mon Sep 17 00:00:00 2001
From: Sarah Schneider <sarahs@github.com>
Date: Thu, 17 Dec 2020 12:10:21 -0500
Subject: [PATCH 35/40] lint

---
 lib/get-map-topic-content.js | 2 +-
 lib/redirects/permalinks.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/get-map-topic-content.js b/lib/get-map-topic-content.js
index 6735d43fe2..53e7af9af2 100644
--- a/lib/get-map-topic-content.js
+++ b/lib/get-map-topic-content.js
@@ -17,7 +17,7 @@ module.exports = function getMapTopicContent (productId, siteTree, currentLangua
   }
 
   if (!childArticles) {
-    console.error(`can\'t find child articles for map topic ${currentPath}`)
+    console.error(`can't find child articles for map topic ${currentPath}`)
     return ''
   }
 
diff --git a/lib/redirects/permalinks.js b/lib/redirects/permalinks.js
index 7e6840f5e1..57f3c4bfa9 100644
--- a/lib/redirects/permalinks.js
+++ b/lib/redirects/permalinks.js
@@ -1,5 +1,5 @@
 const patterns = require('../patterns')
-const { getVersionedPathWithLanguage, getVersionStringFromPath } = require('../path-utils')
+const { getVersionedPathWithLanguage } = require('../path-utils')
 const supportedVersions = new Set(Object.keys(require('../all-versions')))
 const getOldPathsFromPermalink = require('./get-old-paths-from-permalink')
 

From ec0a9d5c38672bfcbc84a995672b219931c7cc7b Mon Sep 17 00:00:00 2001
From: Emily Gould <4822039+emilyistoofunky@users.noreply.github.com>
Date: Thu, 17 Dec 2020 12:10:24 -0600
Subject: [PATCH 36/40] Update mention in contributing (#17045)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0480575521..36f523c053 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -152,7 +152,7 @@ We (usually the docs team, but sometimes GitHub product managers, engineers, or
 You should always review your own PR first.
 
 For content changes, make sure that you:
-- [ ] Confirm that the changes address every part of the content strategy plan from your issue (if there are differences, explain them).
+- [ ] Confirm that the changes address every part of the content design plan from your issue (if there are differences, explain them).
 - [ ] Review the content for technical accuracy.
 - [ ] Review the entire pull request using the [localization checklist](contributing/localization-checklist.md).
 - [ ] Copy-edit the changes for grammar, spelling, and adherence to the style guide.

From 9a0222e353c6758ccdd6e698b4beeb86d2e60214 Mon Sep 17 00:00:00 2001
From: Rachael Sewell <rachmari@github.com>
Date: Thu, 17 Dec 2020 11:03:20 -0800
Subject: [PATCH 37/40] add missing redirect frontmatter (#17042)

Co-authored-by: Sarah Schneider <sarahs@users.noreply.github.com>
---
 content/graphql/reference/enums.md         | 1 +
 content/graphql/reference/input-objects.md | 1 +
 content/graphql/reference/interfaces.md    | 1 +
 content/graphql/reference/mutations.md     | 1 +
 content/graphql/reference/objects.md       | 1 +
 content/graphql/reference/queries.md       | 1 +
 content/graphql/reference/scalars.md       | 1 +
 content/graphql/reference/unions.md        | 1 +
 8 files changed, 8 insertions(+)

diff --git a/content/graphql/reference/enums.md b/content/graphql/reference/enums.md
index f87cc2e4cc..50ff25548c 100644
--- a/content/graphql/reference/enums.md
+++ b/content/graphql/reference/enums.md
@@ -2,6 +2,7 @@
 title: Enums
 redirect_from:
   - /v4/enum
+  - /v4/reference/enum
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
diff --git a/content/graphql/reference/input-objects.md b/content/graphql/reference/input-objects.md
index 423c6511c8..ad927ff2bb 100644
--- a/content/graphql/reference/input-objects.md
+++ b/content/graphql/reference/input-objects.md
@@ -2,6 +2,7 @@
 title: Input objects
 redirect_from:
   - /v4/input_object
+  - /v4/reference/input_object
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
diff --git a/content/graphql/reference/interfaces.md b/content/graphql/reference/interfaces.md
index bfc411d796..492e7b535c 100644
--- a/content/graphql/reference/interfaces.md
+++ b/content/graphql/reference/interfaces.md
@@ -2,6 +2,7 @@
 title: Interfaces
 redirect_from:
   - /v4/interface
+  - /v4/reference/interface
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
diff --git a/content/graphql/reference/mutations.md b/content/graphql/reference/mutations.md
index e42955c3d3..387dcd51ac 100644
--- a/content/graphql/reference/mutations.md
+++ b/content/graphql/reference/mutations.md
@@ -2,6 +2,7 @@
 title: Mutations
 redirect_from:
   - /v4/mutation
+  - /v4/reference/mutation
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
diff --git a/content/graphql/reference/objects.md b/content/graphql/reference/objects.md
index 345786d5e1..7872b01baa 100644
--- a/content/graphql/reference/objects.md
+++ b/content/graphql/reference/objects.md
@@ -2,6 +2,7 @@
 title: Objects
 redirect_from:
   - /v4/object
+  - /v4/reference/object
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
diff --git a/content/graphql/reference/queries.md b/content/graphql/reference/queries.md
index a2cc6af7b1..48b714cd4b 100644
--- a/content/graphql/reference/queries.md
+++ b/content/graphql/reference/queries.md
@@ -3,6 +3,7 @@ title: Queries
 miniTocMaxHeadingLevel: 2
 redirect_from:
   - /v4/query
+  - /v4/reference/query
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
diff --git a/content/graphql/reference/scalars.md b/content/graphql/reference/scalars.md
index 338b4f42c7..2863a61f0d 100644
--- a/content/graphql/reference/scalars.md
+++ b/content/graphql/reference/scalars.md
@@ -2,6 +2,7 @@
 title: Scalars
 redirect_from:
   - /v4/scalar
+  - /v4/reference/scalar
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
diff --git a/content/graphql/reference/unions.md b/content/graphql/reference/unions.md
index 5a87c63fc0..2c9b6a7862 100644
--- a/content/graphql/reference/unions.md
+++ b/content/graphql/reference/unions.md
@@ -2,6 +2,7 @@
 title: Unions
 redirect_from:
   - /v4/union
+  - /v4/reference/union
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

From eeb2b591440459ae8cfa31e994c9a3e8d76b269f Mon Sep 17 00:00:00 2001
From: Rachael Sewell <rachmari@github.com>
Date: Thu, 17 Dec 2020 11:15:45 -0800
Subject: [PATCH 38/40] fix repo-sync bug (#17047)

* fix repo-sync bug

* add another log

* add mergeable_state check

* check for pull number

* add check for prior steps

* remove test logs

* lint
---
 .github/workflows/repo-sync.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml
index 804633901b..eddc1d7130 100644
--- a/.github/workflows/repo-sync.yml
+++ b/.github/workflows/repo-sync.yml
@@ -44,6 +44,7 @@ jobs:
           github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
 
       - name: Create pull request
+        id: create-pull
         uses: repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d
         env:
           GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
@@ -72,9 +73,10 @@ jobs:
 
       # There are cases where the branch becomes out-of-date in between the time this workflow began and when the pull request is created/updated
       - name: Update branch
+        if: ${{ steps.find-pull-request.outputs.number }}
         uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const mainHeadSha = await github.git.getRef({
               ...context.repo,
@@ -84,13 +86,14 @@ jobs:
 
             const pull = await github.pulls.get({
               ...context.repo,
-              pull_number: ${{ steps.find-pull-request.outputs.number }}
+              pull_number: parseInt(${{ steps.find-pull-request.outputs.number }})
             })
+            console.log(`Pull request base sha: ${pull.data.base.sha}`)
 
-            if (mainHeadSha.data.object.sha !== pull.data.base.sha) {
+            if (mainHeadSha.data.object.sha !== pull.data.base.sha || pull.data.mergeable_state === 'behind') {
               const updateBranch = await github.pulls.updateBranch({
                 ...context.repo,
-                pull_number: ${{ steps.find-pull-request.outputs.number }}
+                pull_number: parseInt(${{ steps.find-pull-request.outputs.number }})
               })
               console.log(updateBranch.data.message)
             } else {

From d507eec2e877651a3d77e51b3c2e8226959e4ba3 Mon Sep 17 00:00:00 2001
From: Kevin Heis <heiskr@users.noreply.github.com>
Date: Thu, 17 Dec 2020 11:40:25 -0800
Subject: [PATCH 39/40] Fix load site data reporting wrong timing data (#17050)

---
 lib/redirects/precompile.js |  2 +-
 lib/site-data.js            | 12 ++++++------
 lib/warm-server.js          | 18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/redirects/precompile.js b/lib/redirects/precompile.js
index a7682edab3..d221a0f526 100755
--- a/lib/redirects/precompile.js
+++ b/lib/redirects/precompile.js
@@ -10,7 +10,7 @@ const nonEnterpriseDefaultVersion = require('../non-enterprise-default-version')
 
 // This function runs at server warmup and precompiles possible redirect routes.
 // It outputs them in key-value pairs within a neat Javascript object: { oldPath: newPath }
-module.exports = async function precompileRedirects (pageList, pageMap) {
+module.exports = function precompileRedirects (pageList, pageMap) {
   const allRedirects = {}
 
   // 1. CURRENT PAGES PERMALINKS AND FRONTMATTER
diff --git a/lib/site-data.js b/lib/site-data.js
index bdd47f1ce7..825cba5f22 100755
--- a/lib/site-data.js
+++ b/lib/site-data.js
@@ -5,9 +5,9 @@ const languages = require('./languages')
 const dataDirectory = require('./data-directory')
 const encodeBracketedParentheticals = require('./encode-bracketed-parentheticals')
 
-const loadSiteDataFromDir = async dir => ({
+const loadSiteDataFromDir = dir => ({
   site: {
-    data: await dataDirectory(path.join(dir, 'data'), {
+    data: dataDirectory(path.join(dir, 'data'), {
       preprocess: dataString =>
         encodeBracketedParentheticals(dataString.trimEnd()),
       ignorePatterns: [/README\.md$/]
@@ -15,10 +15,10 @@ const loadSiteDataFromDir = async dir => ({
   }
 })
 
-module.exports = async function loadSiteData () {
+module.exports = function loadSiteData () {
   // load english site data
   const siteData = {
-    en: await loadSiteDataFromDir(languages.en.dir)
+    en: loadSiteDataFromDir(languages.en.dir)
   }
 
   // load and add other language data to siteData where keys match english keys,
@@ -26,7 +26,7 @@ module.exports = async function loadSiteData () {
   const englishKeys = Object.keys(flat(siteData.en))
   for (const language of Object.values(languages)) {
     if (language.code === 'en') continue
-    const data = await loadSiteDataFromDir(language.dir)
+    const data = loadSiteDataFromDir(language.dir)
     for (const key of englishKeys) {
       set(
         siteData,
@@ -45,5 +45,5 @@ module.exports = async function loadSiteData () {
       )
   }
 
-  return Promise.resolve(siteData)
+  return siteData
 }
diff --git a/lib/warm-server.js b/lib/warm-server.js
index cb5e03837c..5d32a143ed 100644
--- a/lib/warm-server.js
+++ b/lib/warm-server.js
@@ -9,7 +9,7 @@ const loadSiteTree = require('./site-tree')
 const dog = {
   loadPages: statsd.timer(loadPages, 'load_pages'),
   loadPageMap: statsd.timer(loadPageMap, 'load_page_map'),
-  loadRedirects: statsd.asyncTimer(loadRedirects, 'load_redirects'),
+  loadRedirects: statsd.timer(loadRedirects, 'load_redirects'),
   loadSiteData: statsd.timer(loadSiteData, 'load_site_data'),
   loadSiteTree: statsd.asyncTimer(loadSiteTree, 'load_site_tree')
 }
@@ -39,20 +39,20 @@ async function warmServer () {
     console.log('Priming context information...')
   }
 
-  if (!pageList || !site) {
-    // Promise.all is used to load multiple things in parallel
-    [pageList, site] = await Promise.all([
-      pageList || dog.loadPages(),
-      site || dog.loadSiteData()
-    ])
+  if (!pageList) {
+    pageList = dog.loadPages()
+  }
+
+  if (!site) {
+    site = dog.loadSiteData()
   }
 
   if (!pageMap) {
-    pageMap = await dog.loadPageMap(pageList)
+    pageMap = dog.loadPageMap(pageList)
   }
 
   if (!redirects) {
-    redirects = await dog.loadRedirects(pageList, pageMap)
+    redirects = dog.loadRedirects(pageList, pageMap)
   }
 
   if (!siteTree) {

From c62f49aa0e2e416ec9c0de99a4fd6c26abc1404a Mon Sep 17 00:00:00 2001
From: Kevin Heis <heiskr@users.noreply.github.com>
Date: Thu, 17 Dec 2020 11:57:18 -0800
Subject: [PATCH 40/40] Block indexing not crawling (#17044)

* Block indexing instead of crawling

* Lint

* Update deprecated-enterprise-versions.js

* Combine loops
---
 .../archived-enterprise-versions-assets.js    |   2 +-
 middleware/archived-enterprise-versions.js    |   2 +-
 middleware/block-robots.js                    |  40 ++++++
 middleware/index.js                           |   1 +
 middleware/robots.js                          |  31 +----
 tests/rendering/block-robots.js               | 117 ++++++++++++++++++
 tests/rendering/robots-txt.js                 |  94 --------------
 .../routing/deprecated-enterprise-versions.js |   2 +-
 8 files changed, 162 insertions(+), 127 deletions(-)
 create mode 100644 middleware/block-robots.js
 create mode 100644 tests/rendering/block-robots.js

diff --git a/middleware/archived-enterprise-versions-assets.js b/middleware/archived-enterprise-versions-assets.js
index 22362e5a83..e34d5adc80 100644
--- a/middleware/archived-enterprise-versions-assets.js
+++ b/middleware/archived-enterprise-versions-assets.js
@@ -25,7 +25,7 @@ module.exports = async (req, res, next) => {
     res.set('content-type', r.headers['content-type'])
     res.set('content-length', r.headers['content-length'])
     res.set('x-is-archived', 'true')
-    res.set('x-robots-tag', 'none')
+    res.set('x-robots-tag', 'noindex')
     res.send(r.body)
   } catch (err) {
     next()
diff --git a/middleware/archived-enterprise-versions.js b/middleware/archived-enterprise-versions.js
index c2c9f6a7ad..1ede1b1504 100644
--- a/middleware/archived-enterprise-versions.js
+++ b/middleware/archived-enterprise-versions.js
@@ -36,7 +36,7 @@ module.exports = async (req, res, next) => {
   try {
     const r = await got(getProxyPath(req.path, requestedVersion))
     res.set('content-type', r.headers['content-type'])
-    res.set('x-robots-tag', 'none')
+    res.set('x-robots-tag', 'noindex')
 
     // make the stubbed redirect files added in >=2.18 return 301 instead of 200
     const staticRedirect = r.body.match(patterns.staticRedirect)
diff --git a/middleware/block-robots.js b/middleware/block-robots.js
new file mode 100644
index 0000000000..7a437972de
--- /dev/null
+++ b/middleware/block-robots.js
@@ -0,0 +1,40 @@
+const languages = require('../lib/languages')
+const products = require('../lib/all-products')
+const { deprecated } = require('../lib/enterprise-server-releases.js')
+
+const pathRegExps = [
+  // Disallow indexing of WIP localized content
+  ...Object.values(languages)
+    .filter(language => language.wip)
+    .map(language => new RegExp(`^/${language.code}(/.*)?$`, 'i')),
+
+  // Disallow indexing of WIP products
+  ...Object.values(products)
+    .filter(product => product.wip || product.hidden)
+    .map(product => [
+      new RegExp(`^/.*?${product.href}`, 'i'),
+      ...product.versions.map(
+        version => new RegExp(`^/.*?${version}/${product.id}`, 'i')
+      )
+    ]),
+
+  // Disallow indexing of deprecated enterprise versions
+  ...deprecated
+    .map(version => [
+      new RegExp(`^/.*?/enterprise-server@${version}/.*?`, 'i'),
+      new RegExp(`^/.*?/enterprise/${version}/.*?`, 'i')
+    ])
+].flat()
+
+function blockIndex (path) {
+  return pathRegExps.some(pathRe => pathRe.test(path))
+}
+
+const middleware = (req, res, next) => {
+  if (blockIndex(req.path)) res.set('x-robots-tag', 'noindex')
+  return next()
+}
+
+middleware.blockIndex = blockIndex
+
+module.exports = middleware
diff --git a/middleware/index.js b/middleware/index.js
index 7996e9f547..ce02a3d347 100644
--- a/middleware/index.js
+++ b/middleware/index.js
@@ -56,6 +56,7 @@ module.exports = function (app) {
 
   // *** Config and context for rendering ***
   app.use(require('./find-page')) // Must come before archived-enterprise-versions, breadcrumbs, featured-links, products, render-page
+  app.use(require('./block-robots'))
 
   // *** Rendering, 2xx responses ***
   // I largely ordered these by use frequency
diff --git a/middleware/robots.js b/middleware/robots.js
index d00986cc85..967d1f21dd 100644
--- a/middleware/robots.js
+++ b/middleware/robots.js
@@ -1,33 +1,4 @@
-const languages = require('../lib/languages')
-const products = require('../lib/all-products')
-const { deprecated } = require('../lib/enterprise-server-releases.js')
-
-let defaultResponse = 'User-agent: *'
-
-// Disallow crawling of WIP localized content
-Object.values(languages)
-  .filter(language => language.wip)
-  .forEach(language => {
-    defaultResponse = defaultResponse.concat(`\nDisallow: /${language.code}\nDisallow: /${language.code}/*\n`)
-  })
-
-// Disallow crawling of WIP products
-Object.values(products)
-  .filter(product => product.wip || product.hidden)
-  .forEach(product => {
-    defaultResponse = defaultResponse.concat(`\nDisallow: /*${product.href}`)
-    product.versions.forEach(version => {
-      defaultResponse = defaultResponse.concat(`\nDisallow: /*${version}/${product.id}`)
-    })
-  })
-
-// Disallow crawling of Deprecated enterprise versions
-deprecated
-  .forEach(version => {
-    defaultResponse = defaultResponse
-      .concat(`\nDisallow: /*/enterprise-server@${version}/*`)
-      .concat(`\nDisallow: /*/enterprise/${version}/*`)
-  })
+const defaultResponse = 'User-agent: *'
 
 const disallowAll = `User-agent: *
 Disallow: /`
diff --git a/tests/rendering/block-robots.js b/tests/rendering/block-robots.js
new file mode 100644
index 0000000000..5110e21e07
--- /dev/null
+++ b/tests/rendering/block-robots.js
@@ -0,0 +1,117 @@
+const { blockIndex } = require('../../middleware/block-robots')
+const languages = require('../../lib/languages')
+const products = require('../../lib/all-products')
+const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
+
+function allowIndex (path) {
+  return !blockIndex(path)
+}
+
+describe('block robots', () => {
+  it('allows crawling of the homepage and English content', async () => {
+    expect(allowIndex('/')).toBe(true)
+    expect(allowIndex('/en')).toBe(true)
+    expect(allowIndex('/en/articles/verifying-your-email-address')).toBe(true)
+  })
+
+  it('allows crawling of generally available localized content', async () => {
+    Object.values(languages)
+      .filter(language => !language.wip)
+      .forEach(language => {
+        expect(allowIndex(`/${language.code}`)).toBe(true)
+        expect(allowIndex(`/${language.code}/articles/verifying-your-email-address`)).toBe(true)
+      })
+  })
+
+  it('disallows crawling of WIP localized content', async () => {
+    Object.values(languages)
+      .filter(language => language.wip)
+      .forEach(language => {
+        expect(allowIndex(`/${language.code}`)).toBe(false)
+        expect(allowIndex(`/${language.code}/articles/verifying-your-email-address`)).toBe(false)
+      })
+  })
+
+  it('disallows crawling of WIP products', async () => {
+    const wipProductIds = Object.values(products)
+      .filter(product => product.wip)
+      .map(product => product.id)
+
+    wipProductIds.forEach(id => {
+      const { href } = products[id]
+      const blockedPaths = [
+        // English
+        `/en${href}`,
+        `/en${href}/overview`,
+        `/en${href}/overview/intro`,
+        `/en/enterprise/${enterpriseServerReleases.latest}/user${href}`,
+        `/en/enterprise/${enterpriseServerReleases.oldestSupported}/user${href}`,
+
+        // Japanese
+        `/ja${href}`,
+        `/ja${href}/overview`,
+        `/ja${href}/overview/intro`,
+        `/ja/enterprise/${enterpriseServerReleases.latest}/user${href}`,
+        `/ja/enterprise/${enterpriseServerReleases.oldestSupported}/user${href}`
+      ]
+
+      blockedPaths.forEach(path => {
+        expect(allowIndex(path)).toBe(false)
+      })
+    })
+  })
+
+  it('disallows crawling of early access "hidden" products', async () => {
+    const hiddenProductIds = Object.values(products)
+      .filter(product => product.hidden)
+      .map(product => product.id)
+
+    hiddenProductIds.forEach(id => {
+      const { versions } = products[id]
+      const blockedPaths = versions.map(version => {
+        return [
+          // English
+          `/en/${version}/${id}`,
+          `/en/${version}/${id}/some-early-access-article`,
+          // Japanese
+          `/ja/${version}/${id}`,
+          `/ja/${version}/${id}/some-early-access-article`
+        ]
+      }).flat()
+
+      blockedPaths.forEach(path => {
+        expect(allowIndex(path)).toBe(false)
+      })
+    })
+  })
+
+  it('allows crawling of non-WIP products', async () => {
+    expect('actions' in products).toBe(true)
+    expect(allowIndex('/en/actions')).toBe(true)
+    expect(allowIndex('/en/actions/overview')).toBe(true)
+    expect(allowIndex('/en/actions/overview/intro')).toBe(true)
+    expect(allowIndex(`/en/enterprise/${enterpriseServerReleases.latest}/user/actions`)).toBe(true)
+    expect(allowIndex(`/en/enterprise/${enterpriseServerReleases.oldestSupported}/user/actions`)).toBe(true)
+  })
+
+  it('disallows crawling of deprecated enterprise releases', async () => {
+    enterpriseServerReleases.deprecated.forEach(version => {
+      const blockedPaths = [
+        // English
+        `/en/enterprise-server@${version}/actions`,
+        `/en/enterprise/${version}/actions`,
+        `/en/enterprise-server@${version}/actions/overview`,
+        `/en/enterprise/${version}/actions/overview`,
+        // Japanese
+        `/ja/enterprise-server@${version}/actions`,
+        `/ja/enterprise/${version}/actions`,
+        `/ja/enterprise-server@${version}/actions/overview`,
+        `/ja/enterprise/${version}/actions/overview`
+      ]
+
+      blockedPaths.forEach(path => {
+        expect(allowIndex(path)).toBe(false)
+      })
+    })
+  })
+})
diff --git a/tests/rendering/robots-txt.js b/tests/rendering/robots-txt.js
index 6bd7854269..2835baa908 100644
--- a/tests/rendering/robots-txt.js
+++ b/tests/rendering/robots-txt.js
@@ -3,8 +3,6 @@ const robotsParser = require('robots-parser')
 const robotsMiddleware = require('../../middleware/robots')
 const { get } = require('../helpers/supertest')
 const MockExpressResponse = require('mock-express-response')
-const products = require('../../lib/all-products')
-const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
 
 describe('robots.txt', () => {
   jest.setTimeout(5 * 60 * 1000)
@@ -31,15 +29,6 @@ describe('robots.txt', () => {
       })
   })
 
-  it('disallows indexing of WIP localized content', async () => {
-    Object.values(languages)
-      .filter(language => language.wip)
-      .forEach(language => {
-        expect(robots.isAllowed(`https://docs.github.com/${language.code}`)).toBe(false)
-        expect(robots.isAllowed(`https://docs.github.com/${language.code}/articles/verifying-your-email-address`)).toBe(false)
-      })
-  })
-
   it('disallows indexing of herokuapp.com domains', async () => {
     const req = {
       hostname: 'docs-internal-12345--my-branch.herokuapp.com',
@@ -52,89 +41,6 @@ describe('robots.txt', () => {
     expect(res._getString()).toEqual('User-agent: *\nDisallow: /')
   })
 
-  it('disallows indexing of WIP products', async () => {
-    const wipProductIds = Object.values(products)
-      .filter(product => product.wip)
-      .map(product => product.id)
-
-    wipProductIds.forEach(id => {
-      const { href } = products[id]
-      const blockedPaths = [
-        // English
-        `https://docs.github.com/en${href}`,
-        `https://docs.github.com/en${href}/overview`,
-        `https://docs.github.com/en${href}/overview/intro`,
-        `https://docs.github.com/en/enterprise/${enterpriseServerReleases.latest}/user${href}`,
-        `https://docs.github.com/en/enterprise/${enterpriseServerReleases.oldestSupported}/user${href}`,
-
-        // Japanese
-        `https://docs.github.com/ja${href}`,
-        `https://docs.github.com/ja${href}/overview`,
-        `https://docs.github.com/ja${href}/overview/intro`,
-        `https://docs.github.com/ja/enterprise/${enterpriseServerReleases.latest}/user${href}`,
-        `https://docs.github.com/ja/enterprise/${enterpriseServerReleases.oldestSupported}/user${href}`
-      ]
-
-      blockedPaths.forEach(path => {
-        expect(robots.isAllowed(path)).toBe(false)
-      })
-    })
-  })
-
-  it('disallows indexing of early access "hidden" products', async () => {
-    const hiddenProductIds = Object.values(products)
-      .filter(product => product.hidden)
-      .map(product => product.id)
-
-    hiddenProductIds.forEach(id => {
-      const { versions } = products[id]
-      const blockedPaths = versions.map(version => {
-        return [
-          // English
-          `https://docs.github.com/en/${version}/${id}`,
-          `https://docs.github.com/en/${version}/${id}/some-early-access-article`,
-          // Japanese
-          `https://docs.github.com/ja/${version}/${id}`,
-          `https://docs.github.com/ja/${version}/${id}/some-early-access-article`
-        ]
-      }).flat()
-
-      blockedPaths.forEach(path => {
-        expect(robots.isAllowed(path)).toBe(false)
-      })
-    })
-  })
-
-  it('allows indexing of non-WIP products', async () => {
-    expect('actions' in products).toBe(true)
-    expect(robots.isAllowed('https://docs.github.com/en/actions')).toBe(true)
-    expect(robots.isAllowed('https://docs.github.com/en/actions/overview')).toBe(true)
-    expect(robots.isAllowed('https://docs.github.com/en/actions/overview/intro')).toBe(true)
-    expect(robots.isAllowed(`https://docs.github.com/en/enterprise/${enterpriseServerReleases.latest}/user/actions`)).toBe(true)
-    expect(robots.isAllowed(`https://docs.github.com/en/enterprise/${enterpriseServerReleases.oldestSupported}/user/actions`)).toBe(true)
-  })
-
-  it('disallows indexing of deprecated enterprise releases', async () => {
-    enterpriseServerReleases.deprecated.forEach(version => {
-      const blockedPaths = [
-        // English
-        `https://docs.github.com/en/enterprise-server@${version}/actions`,
-        `https://docs.github.com/en/enterprise/${version}/actions`,
-        `https://docs.github.com/en/enterprise-server@${version}/actions/overview`,
-        `https://docs.github.com/en/enterprise/${version}/actions/overview`,
-        // Japanese
-        `https://docs.github.com/ja/enterprise-server@${version}/actions`,
-        `https://docs.github.com/ja/enterprise/${version}/actions`,
-        `https://docs.github.com/ja/enterprise-server@${version}/actions/overview`,
-        `https://docs.github.com/ja/enterprise/${version}/actions/overview`
-      ]
-
-      blockedPaths.forEach(path => {
-        expect(robots.isAllowed(path)).toBe(false)
-      })
-    })
-  })
-
   it('does not have duplicate lines', () => {
     const lines = new Set()
     for (const line of res.text.split('\n')) {
diff --git a/tests/routing/deprecated-enterprise-versions.js b/tests/routing/deprecated-enterprise-versions.js
index 9b5ea537d7..79985e90a6 100644
--- a/tests/routing/deprecated-enterprise-versions.js
+++ b/tests/routing/deprecated-enterprise-versions.js
@@ -40,7 +40,7 @@ describe('enterprise deprecation', () => {
   test('sets the expected x-robots-tag header for deprecated Enterprise pages', async () => {
     const res = await get('/en/enterprise/2.13/user/articles/about-branches')
     expect(res.statusCode).toBe(200)
-    expect(res.get('x-robots-tag')).toBe('none')
+    expect(res.get('x-robots-tag')).toBe('noindex')
   })
 
   test('handles requests for deprecated Enterprise pages ( <2.13 )', async () => {