Merge branch 'main' into check-for-outdated-links

Author: sarahs

content/actions/hosting-your-own-runners/about-self-hosted-runners.md

@@ -120,6 +120,7 @@ You must ensure that the machine has the appropriate network access to communica
 github.com
 api.github.com
 *.actions.githubusercontent.com
+github-releases.githubusercontent.com
 codeload.github.com
 ```
 

content/actions/quickstart.md

@@ -78,7 +78,7 @@ Committing the workflow file in your repository triggers the `push` event and ru
 
 ### Next steps
 
-The super-linter workflow you just added runs any time code is pushed to your repository to help you spot errors and inconsistencies in your code. But, this is only the beginning of what you can do with {% data variables.product.prodname_actions %}. Your repository can contain multiple workflows that trigger different jobs based on different events. {% data variables.product.prodname_actions %} can help you automate nearly every aspect of your application development processes. Ready to get started? Here are some helpful resources for taking your next steps with {% data variables.product.prodname_actions %}:
+The super-linter workflow you just added runs each time code is pushed to your repository to help you spot errors and inconsistencies in your code. But this is only the beginning of what you can do with {% data variables.product.prodname_actions %}. Your repository can contain multiple workflows that trigger different jobs based on different events. {% data variables.product.prodname_actions %} can help you automate nearly every aspect of your application development processes. Ready to get started? Here are some helpful resources for taking your next steps with {% data variables.product.prodname_actions %}:
 
 - "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)" for an in-depth tutorial
 - "[Guides](/actions/guides)" for specific uses cases and examples
@@ -88,7 +88,7 @@ The super-linter workflow you just added runs any time code is pushed to your re
 
 ### Introduction
 
-Printing "Hello, World!" is a great way to explore the basic set up and syntax of a new programming language. In this guide, you'll use GitHub Actions to print "Hello, World!" within your {% data variables.product.prodname_dotcom %} repository's workflow logs. All you need to get started is a {% data variables.product.prodname_dotcom %} repository where you feel comfortable creating and running a sample {% data variables.product.prodname_actions %} workflow. Feel free to create a new repository for this Quickstart, you can use it to test this and future {% data variables.product.prodname_actions %} workflows.
+Printing "Hello, World!" is a great way to explore the basic set up and syntax of a new programming language. In this guide, you'll use GitHub Actions to print "Hello, World!" within your {% data variables.product.prodname_dotcom %} repository's workflow logs. All you need to get started is a {% data variables.product.prodname_dotcom %} repository where you feel comfortable creating and running a sample {% data variables.product.prodname_actions %} workflow. Feel free to create a new repository for this Quickstart to test this and future {% data variables.product.prodname_actions %} workflows.
 
 ### Creating your first workflow
 
@@ -143,7 +143,7 @@ Printing "Hello, World!" is a great way to explore the basic set up and syntax o
 
 ### Next steps
 
-The hello-world workflow you just added is a simple example of a manually triggered workflow. This is only the beginning of what you can do with {% data variables.product.prodname_actions %}. Your repository can contain multiple workflows that trigger different jobs based on different events. {% data variables.product.prodname_actions %} can help you automate nearly every aspect of your application development processes. Ready to get started? Here are some helpful resources for taking your next steps with {% data variables.product.prodname_actions %}:
+The hello-world workflow you just added is a minimal example of a manually triggered workflow. This is only the beginning of what you can do with {% data variables.product.prodname_actions %}. Your repository can contain multiple workflows that trigger different jobs based on different events. {% data variables.product.prodname_actions %} can help you automate nearly every aspect of your application development processes. Ready to get started? Here are some helpful resources for taking your next steps with {% data variables.product.prodname_actions %}:
 
 - "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)" for an in-depth tutorial
 - "[Guides](/actions/guides)" for specific uses cases and examples

content/github/developing-online-with-codespaces/about-codespaces.md

@@ -56,4 +56,4 @@ A limited number of people will be invited to join the beta. To join the waitlis
 
 If you encounter problems using {% data variables.product.prodname_codespaces %}, see "[Troubleshooting your codespace](/github/developing-online-with-codespaces/troubleshooting-your-codespace)."
 
-If you still need help or have feedback about {% data variables.product.prodname_codespaces %}, use the [Community Forum](https://github.community/c/codespaces-beta/45).
+If you still need help or have feedback about {% data variables.product.prodname_codespaces %}, use the [Codespaces Feedback](https://github.com/github/feedback/discussions/categories/codespaces-feedback) discussion.

content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md

@@ -25,7 +25,17 @@ To attach a file to an issue or pull request conversation, drag and drop it into
 
 {% endtip %}
 
-The maximum size for files is 25MB and the maximum size for images is 10MB.
+The maximum size for files is 25MB and the maximum size for images is 10MB.  
+{% if currentVersion == "free-pro-team@latest" %}
+Videos can be up to 100 MB in size if the repository is owned by a user or organization on a paid GitHub plan.
+
+{% note %}
+
+**Note:** Support for video attachments is currently in beta and subject to change. 
+
+{% endnote %}
+
+{% endif %}
 
 We support these files:
 
@@ -36,6 +46,7 @@ We support these files:
 * Microsoft Word (*.docx*), Powerpoint (*.pptx*), and Excel (*.xlsx*) documents
 * Text files (*.txt*)
 * PDFs (*.pdf*)
-* ZIP (*.zip*, *.gz*)
+* ZIP (*.zip*, *.gz*){% if currentVersion == "free-pro-team@latest" %}
+* Video (*.mp4*, *.mov*){% endif %}
 
 ![Attachments animated GIF](/assets/images/help/pull_requests/dragging_images.gif)

content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md

@@ -8,11 +8,7 @@ versions:
   enterprise-server: '*'
   github-ae: '*'
 ---
-{% note %}
-
-**Note:** In order to link a repository to your organization or user owned project board the repository needs to have issues enabled. For information on how to see if issues are disabled for a repository, see "[Disabling issues](/github/managing-your-work-on-github/disabling-issues) ."
 
-{% endnote %}
 
 Anyone with write permissions to a project board can link repositories owned by that organization or user account to the project board. For more information, see "[Project board permissions for an organization](/articles/project-board-permissions-for-an-organization/)" or "[Permission levels for user-owned project boards](/articles/permission-levels-for-user-owned-project-boards/)."
 
@@ -30,6 +26,12 @@ Anyone with write permissions to a project board can link repositories owned by
 7. Click **Link**. To unlink, click **Unlink**.
 ![Link button](/assets/images/help/projects/link-button.png)
 
+{% note %}
+
+**Note:** In order to link a repository to your organization or user owned project board the repository needs to have issues enabled. That is, the repository has an "Issues" tab (in forked repositories issues are disabled by default).  For information on how to enable or disable issues for a repository, see "[Disabling issues for a repository](/github/managing-your-work-on-github/disabling-issues)."
+
+{% endnote %}
+
 ### Further reading
 
 - "[About projects boards](/articles/about-project-boards)"

content/github/working-with-github-pages/about-github-pages-and-jekyll.md

@@ -91,9 +91,9 @@ You can download or create Jekyll plugins to extend the functionality of Jekyll
 - [`jekyll-titles-from-headings`](https://github.com/benbalter/jekyll-titles-from-headings)
 - [`jekyll-relative-links`](https://github.com/benbalter/jekyll-relative-links)
 
-You can enable additional plugins by adding the plugin's gem to the `plugins` setting in your *_config.yml* file. For more information, see "[Configuration](https://jekyllrb.com/docs/configuration/)" in the Jekyll documentation. For a list of supported plugins, see "[Dependency versions](https://pages.github.com/versions/)" on the {% data variables.product.prodname_pages %} site.
+You can enable additional plugins by adding the plugin's gem to the `plugins` setting in your *_config.yml* file. For more information, see "[Configuration](https://jekyllrb.com/docs/configuration/)" in the Jekyll documentation. 
 
-For usage information for a specific plugin, see the plugin's documentation.
+For a list of supported plugins, see "[Dependency versions](https://pages.github.com/versions/)" on the {% data variables.product.prodname_pages %} site.  For usage information for a specific plugin, see the plugin's documentation.
 
 {% tip %}
 

data/reusables/pages/new-or-existing-repo.md

@@ -1,5 +1,5 @@
 If your site is an independent project, you can create a new repository to store your site's source code. If your site is associated with an existing project, you can add the source code {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}to that project's repository, in a `/docs` folder on the default branch or on a different branch.{% else %}for your site to a `gh-pages` branch or a `docs` folder on the `master` branch in that project's repository.{% endif %} For example, if you're creating a site to publish documentation for a project that's already on {% data variables.product.product_name %}, you may want to store the source code for the site in the same repository as the project.
 
-{% if currentVersion == "free-pro-team@latest" %}If the account that owns the repository uses {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_free_team %}, the repository must be public.{% endif %}
+{% if currentVersion == "free-pro-team@latest" %}If the account that owns the repository uses {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_free_team %} for organizations, the repository must be public.{% endif %}
 
 If you want to create a site in an existing repository, skip to the "[Creating your site](#creating-your-site)" section.

lib/enterprise-server-releases.js

@@ -47,8 +47,8 @@ const nextDeprecationDate = dates[oldestSupported].deprecationDate
 const isOldestReleaseDeprecated = new Date() > new Date(nextDeprecationDate)
 const deprecatedOnNewSite = deprecated.filter(version => versionSatisfiesRange(version, '>=2.13'))
 const firstVersionDeprecatedOnNewSite = '2.13'
-// starting from 2.18, we updated the archival script to create stubbed HTML redirect files
-const lastVersionWithoutStubbedRedirectFiles = '2.17'
+// starting from 2.18, we updated the archival script to create a redirects.json top-level file in the archived repo
+const lastVersionWithoutArchivedRedirectsFile = '2.17'
 // last version using paths like /enterprise/<release>/<user>/<product>/<category>/<article>
 // instead of /enterprise-server@<release>/<product>/<category>/<article>
 const lastReleaseWithLegacyFormat = '2.18'
@@ -68,7 +68,7 @@ module.exports = {
   deprecatedOnNewSite,
   dates,
   firstVersionDeprecatedOnNewSite,
-  lastVersionWithoutStubbedRedirectFiles,
+  lastVersionWithoutArchivedRedirectsFile,
   lastReleaseWithLegacyFormat,
   deprecatedReleasesWithLegacyFormat,
   deprecatedReleasesWithNewFormat,

middleware/archived-enterprise-versions.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const slash = require('slash')
-const { firstVersionDeprecatedOnNewSite, lastVersionWithoutStubbedRedirectFiles } = require('../lib/enterprise-server-releases')
+const { firstVersionDeprecatedOnNewSite, lastVersionWithoutArchivedRedirectsFile } = require('../lib/enterprise-server-releases')
 const patterns = require('../lib/patterns')
 const versionSatisfiesRange = require('../lib/version-satisfies-range')
 const isArchivedVersion = require('../lib/is-archived-version')
@@ -25,21 +25,42 @@ module.exports = async (req, res, next) => {
   }
 
   // find redirects for versions between 2.13 and 2.17
-  // starting with 2.18, we updated the archival script to create stubbed HTML redirect files
+  // starting with 2.18, we updated the archival script to create a redirects.json file
   if (versionSatisfiesRange(requestedVersion, `>=${firstVersionDeprecatedOnNewSite}`) &&
-    versionSatisfiesRange(requestedVersion, `<=${lastVersionWithoutStubbedRedirectFiles}`)) {
+    versionSatisfiesRange(requestedVersion, `<=${lastVersionWithoutArchivedRedirectsFile}`)) {
     const redirect = archvivedRedirects[req.path]
     if (redirect && redirect !== req.path) {
       return res.redirect(301, redirect)
     }
   }
 
+  let reqPath = req.path
+  let isRedirect = false
+  if (versionSatisfiesRange(requestedVersion, `>${lastVersionWithoutArchivedRedirectsFile}`)) {
+    try {
+      const redirectJson = await got(getProxyPath('redirects.json', requestedVersion))
+
+      if (redirectJson[req.path]) {
+        isRedirect = true
+      }
+      reqPath = redirectJson[req.path] || req.path
+    } catch (err) {
+      // nooop
+    }
+  }
+
   try {
-    const r = await got(getProxyPath(req.path, requestedVersion))
+    const r = await got(getProxyPath(reqPath, requestedVersion))
     res.set('content-type', r.headers['content-type'])
     res.set('x-robots-tag', 'noindex')
 
-    // make the stubbed redirect files added in >=2.18 return 301 instead of 200
+    // make redirects found via redirects.json return 301 instead of 200
+    if (isRedirect) {
+      res.status(301)
+      res.set('location', reqPath)
+    }
+
+    // make stubbed redirect files (which exist in versions <2.13) return 301 instead of 200
     const staticRedirect = r.body.match(patterns.staticRedirect)
     if (staticRedirect) {
       res.status(301)
@@ -73,7 +94,7 @@ function getProxyPath (reqPath, requestedVersion) {
 // this workaround finds potentially relevant frontmatter redirects in currently supported pages
 function getFallbackRedirects (req, requestedVersion) {
   if (versionSatisfiesRange(requestedVersion, `<${firstVersionDeprecatedOnNewSite}`)) return
-  if (versionSatisfiesRange(requestedVersion, `>${lastVersionWithoutStubbedRedirectFiles}`)) return
+  if (versionSatisfiesRange(requestedVersion, `>${lastVersionWithoutArchivedRedirectsFile}`)) return
 
   return archivedFrontmatterFallbacks.find(arrayOfFallbacks => arrayOfFallbacks.includes(req.path))
 }

script/enterprise-server-deprecations/archive-version.js

@@ -9,7 +9,6 @@ const host = `http://localhost:${port}`
 const scrape = require('website-scraper')
 const program = require('commander')
 const rimraf = require('rimraf').sync
-const mkdirp = require('mkdirp').sync
 const version = require('../../lib/enterprise-server-releases').oldestSupported
 const archivalRepoName = 'help-docs-archived-enterprise-versions'
 const archivalRepoUrl = `https://github.com/github/${archivalRepoName}`
@@ -173,18 +172,20 @@ async function main () {
     console.log(`\n\ndone scraping! added files to ${path.relative(process.cwd(), finalDirectory)}\n`)
 
     // create redirect html files to preserve frontmatter redirects
-    await createRedirectPages(permalinksPerVersion, pageMap, finalDirectory)
+    await createRedirectsFile(permalinksPerVersion, pageMap, finalDirectory)
 
     console.log(`next step: deprecate ${version} in lib/enterprise-server-releases.js`)
 
     process.exit()
   })
 }
 
-async function createRedirectPages (permalinks, pageMap, finalDirectory) {
+async function createRedirectsFile (permalinks, pageMap, finalDirectory) {
   const pagesPerVersion = permalinks.map(permalink => pageMap[permalink])
   const redirects = await loadRedirects(pagesPerVersion, pageMap)
 
+  const redirectsPerVersion = {}
+
   Object.entries(redirects).forEach(([oldPath, newPath]) => {
     // remove any liquid variables that sneak in
     oldPath = oldPath
@@ -193,31 +194,8 @@ async function createRedirectPages (permalinks, pageMap, finalDirectory) {
     // ignore any old paths that are not in this version
     if (!(oldPath.includes(`/enterprise-server@${version}`) || oldPath.includes(`/enterprise/${version}`))) return
 
-    const fullPath = path.join(finalDirectory, oldPath)
-    const filename = `${fullPath}/index.html`
-    const html = getRedirectHtml(newPath)
-
-    mkdirp(fullPath)
-    fs.writeFileSync(filename, html)
+    redirectsPerVersion[oldPath] = newPath
   })
 
-  console.log('done creating redirect files!\n')
-}
-
-// redirect html files already exist in <=2.12 because these versions were deprecated on the old static site
-function getRedirectHtml (newPath) {
-  return `<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Redirecting...</title>
-<link rel="canonical" href="${newPath}">
-<meta http-equiv="refresh" content="0; url=${newPath}">
-</head>
-<body>
-<h1>Redirecting...</h1>
-<a href="${newPath}">Click here if you are not redirected.</a>
-<script>location='${newPath}'</script>
-</body>
-</html>`
+  fs.writeFileSync(path.posix.join(finalDirectory, 'redirects.json'), JSON.stringify(redirectsPerVersion, null, 2))
 }