repo sync

Octomerger · web-flow · commit a265add35eb8 · 2021-01-15T06:12:10.000+10:00
diff --git a/content/developers/apps/scopes-for-oauth-apps.md b/content/developers/apps/scopes-for-oauth-apps.md
@@ -46,8 +46,8 @@ Name | Description
 &emsp;`repo_deployment`| Grants access to [deployment statuses](/rest/reference/repos#deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code.
 &emsp;`public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.
 &emsp;`repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}
-&emsp;`security_events` | Grants: <br/> read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). <br/> read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning).{% endif %}{% if currentVersion ver_gt "enterprise-server@2.21" and currentVersion ver_lt "enterprise-server@3.1" %}
-&emsp;`security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning).{% endif %}
+&emsp;`security_events` | Grants: <br/> read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning) <br/> read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning) <br/> This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %}{% if currentVersion ver_gt "enterprise-server@2.21" and currentVersion ver_lt "enterprise-server@3.1" %}
+&emsp;`security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning). This scope is only necessary to grant other users or services access to security events *without* granting access to the code.{% endif %}
 **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks.
 &emsp;`write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories.
 &emsp;`read:repo_hook`| Grants read and ping access to hooks in public or private repositories.
diff --git a/content/github/site-policy-deprecated/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md b/content/github/site-policy-deprecated/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md
@@ -6,6 +6,7 @@ redirect_from:
   - /articles/proposed-amendment-to-github-terms-of-service-applicable-to-u-s-federal-government-users/
   - /articles/amendment-to-github-terms-of-service-applicable-to-u-s-federal-government-users
   - /articles/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users
+  - /github/site-policy/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-ae-data-protection-agreement.md b/content/github/site-policy-deprecated/github-ae-data-protection-agreement.md
@@ -5,6 +5,7 @@ versions:
   free-pro-team: '*'
 redirect_from:
   - /github/site-policy/ghem-data-protection-addendum
+  - /github/site-policy/github-ae-data-protection-agreement
 ---
 
 _These terms apply to Customers who licensed the Products prior to January 4, 2021._
diff --git a/content/github/site-policy-deprecated/github-ae-product-specific-terms.md b/content/github/site-policy-deprecated/github-ae-product-specific-terms.md
@@ -5,6 +5,7 @@ versions:
   free-pro-team: '*'
 redirect_from:
   - /github/site-policy/ghem-supplemental-terms-for-microsoft-volume-licensing
+  - /github/site-policy/github-ae-product-specific-terms
 ---
 
 _These terms apply to Customers who licensed the Products prior to January 4, 2021._
diff --git a/content/github/site-policy-deprecated/github-connect-addendum-to-the-github-enterprise-license-agreement.md b/content/github/site-policy-deprecated/github-connect-addendum-to-the-github-enterprise-license-agreement.md
@@ -4,6 +4,7 @@ hidden: true
 redirect_from:
   - /articles/github-com-connection-addendum-to-the-github-enterprise-license-agreement/
   - /articles/github-connect-addendum-to-the-github-enterprise-license-agreement
+  - /github/site-policy/github-connect-addendum-to-the-github-enterprise-license-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-data-protection-addendum.md b/content/github/site-policy-deprecated/github-data-protection-addendum.md
@@ -1,6 +1,8 @@
 ---
 title: GitHub Data Protection Addendum
 hidden: true
+redirect_from:
+  - /github/site-policy/github-data-protection-addendum
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-enterprise-cloud-evaluation-agreement.md b/content/github/site-policy-deprecated/github-enterprise-cloud-evaluation-agreement.md
@@ -3,6 +3,7 @@ title: GitHub Enterprise Cloud Evaluation Agreement
 hidden: true
 redirect_from:
   - /articles/github-enterprise-cloud-evaluation-agreement
+  - /github/site-policy/github-enterprise-cloud-evaluation-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-enterprise-server-license-agreement.md b/content/github/site-policy-deprecated/github-enterprise-server-license-agreement.md
@@ -3,6 +3,7 @@ title: GitHub Enterprise Server License Agreement
 hidden: true
 redirect_from:
   - /articles/github-enterprise-server-license-agreement
+  - /github/site-policy/github-enterprise-server-license-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-enterprise-service-level-agreement.md b/content/github/site-policy-deprecated/github-enterprise-service-level-agreement.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github-enterprise-cloud-addendum/
   - /github-business-cloud-addendum/
   - /articles/github-enterprise-cloud-addendum
+  - /github/site-policy/github-enterprise-service-level-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md b/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md
@@ -4,6 +4,7 @@ hidden: true
 redirect_from:
   - /articles/github-enterprise-agreement/
   - /articles/github-enterprise-subscription-agreement
+  - /github/site-policy/github-enterprise-subscription-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md b/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md
@@ -4,6 +4,7 @@ hidden: true
 redirect_from:
   - /articles/GitHub-Supplemental-Terms-for-Microsoft-Volume-Licensing/
   - /articles/github-supplemental-terms-for-microsoft-volume-licensing
+  - /github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy/index.md b/content/github/site-policy/index.md
@@ -13,17 +13,8 @@ versions:
 {% link_in_list /github-terms-of-service %}
 {% link_in_list /github-corporate-terms-of-service %}
 {% link_in_list /github-privacy-statement %}
-{% link_in_list /github-data-protection-addendum %}
 {% link_in_list /global-privacy-practices %}
-{% link_in_list /github-enterprise-server-license-agreement %}
-{% link_in_list /github-ae-data-protection-agreement %}
-{% link_in_list /github-ae-product-specific-terms %}
-{% link_in_list /github-enterprise-service-level-agreement %}
-{% link_in_list /github-connect-addendum-to-the-github-enterprise-license-agreement %}
-{% link_in_list /github-supplemental-terms-for-microsoft-volume-licensing %}
-{% link_in_list /github-enterprise-subscription-agreement %}
 {% link_in_list /github-insights-and-data-protection-for-your-organization %}
-{% link_in_list /github-enterprise-cloud-evaluation-agreement %}
 {% link_in_list /github-sponsors-additional-terms %}
 {% link_in_list /github-additional-product-terms %}
 {% link_in_list /github-logo-policy %}
@@ -37,7 +28,6 @@ versions:
 {% link_in_list /github-subprocessors-and-cookies %}
 {% link_in_list /github-bug-bounty-program-legal-safe-harbor %}
 {% link_in_list /responsible-disclosure-of-security-vulnerabilities %}
-{% link_in_list /amendment-to-github-terms-of-service-applicable-to-us-federal-government-users %}
 {% link_in_list /guidelines-for-legal-requests-of-user-data %}
 {% link_in_list /github-government-takedown-policy %}
 {% link_in_list /github-acceptable-use-policies %}
diff --git a/crowdin.yml b/crowdin.yml
@@ -4,16 +4,7 @@ files:
     ignore:
       - '/content/README.md'
       - '/content/early-access'
-      - '/content/github/site-policy/github-enterprise-cloud-evaluation-agreement.md'
-      - '/content/github/site-policy/github-enterprise-service-level-agreement.md'
-      - '/content/github/site-policy/github-enterprise-server-license-agreement.md'
-      - '/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md'
-      - '/content/github/site-policy/github-ae-product-specific-terms.md'
-      - '/content/github/site-policy/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md'
-      - '/content/github/site-policy/github-enterprise-subscription-agreement.md'
-      - '/content/github/site-policy/github-data-protection-addendum.md'
-      - '/content/github/site-policy/github-connect-addendum-to-the-github-enterprise-license-agreement.md'
-      - '/content/github/site-policy/github-ae-data-protection-agreement.md'
+      - '/content/github/site-policy-deprecated'
   - source: /data/**/*.yml
     translation: /translations/%locale%/%original_path%/%original_file_name%
   - source: /data/**/*.md
diff --git a/lib/warm-server.js b/lib/warm-server.js
@@ -7,8 +7,8 @@ const loadSiteTree = require('./site-tree')
 // Instrument these functions so that
 // it's wrapped in a timer that reports to Datadog
 const dog = {
-  loadPages: statsd.timer(loadPages, 'load_pages'),
-  loadPageMap: statsd.timer(loadPageMap, 'load_page_map'),
+  loadPages: statsd.asyncTimer(loadPages, 'load_pages'),
+  loadPageMap: statsd.asyncTimer(loadPageMap, 'load_page_map'),
   loadRedirects: statsd.timer(loadRedirects, 'load_redirects'),
   loadSiteData: statsd.timer(loadSiteData, 'load_site_data'),
   loadSiteTree: statsd.asyncTimer(loadSiteTree, 'load_site_tree')
diff --git a/middleware/contextualizers/graphql.js b/middleware/contextualizers/graphql.js
@@ -9,14 +9,17 @@ const explorerUrl = process.env.NODE_ENV === 'production'
   : 'http://localhost:3000'
 
 module.exports = async (req, res, next) => {
+  const currentVersionObj = allVersions[req.context.currentVersion]
   // ignore requests to non-GraphQL reference paths
-  if (!req.path.includes('/graphql/')) return next()
-
+  // and to versions that don't exist
+  if (!req.path.includes('/graphql/') || !currentVersionObj) {
+    return next()
+  }
   // Get the relevant name of the GraphQL schema files for the current version
   // For example, free-pro-team@latest corresponds to dotcom,
   // enterprise-server@2.22 corresponds to ghes-2.22,
   // and github-ae@latest corresponds to ghae
-  const graphqlVersion = allVersions[req.context.currentVersion].miscVersionName
+  const graphqlVersion = currentVersionObj.miscVersionName
 
   req.context.graphql = {
     schemaForCurrentVersion: require(`../../lib/graphql/static/schema-${graphqlVersion}`),
diff --git a/middleware/contextualizers/webhooks.js b/middleware/contextualizers/webhooks.js
@@ -5,14 +5,18 @@ const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-ve
 const allVersions = require('../../lib/all-versions')
 
 module.exports = async (req, res, next) => {
-  if (!req.path.includes('webhook')) return next()
+  const currentVersionObj = allVersions[req.context.currentVersion]
+  // ignore requests to non-webhook reference paths
+  // and to versions that don't exist
+  if (!req.path.includes('webhook') || !currentVersionObj) {
+    return next()
+  }
 
   // Get the name of the dir under lib/webhooks/static
   // For example, free-pro-team@latest corresponds to dotcom,
   // enterprise-server@2.22 corresponds to ghes-2.22,
   // and github-ae@latest corresponds to ghae
-  if (!allVersions[req.context.currentVersion]) return next()
-  const webhookPayloadDir = allVersions[req.context.currentVersion].miscVersionName
+  const webhookPayloadDir = currentVersionObj.miscVersionName
 
   const webhookPayloadsForCurrentVersion = webhookPayloads[webhookPayloadDir]
 
diff --git a/middleware/csp.js b/middleware/csp.js
@@ -56,7 +56,9 @@ module.exports = async (req, res, next) => {
 
   // Exception for Algolia instantsearch in deprecated Enterprise docs (Node.js era)
   if (versionSatisfiesRange(requestedVersion, '<=2.19') && versionSatisfiesRange(requestedVersion, '>2.12')) {
-    csp.directives.scriptSrc.push("'unsafe-eval'")
+    csp.directives.scriptSrc.push("'unsafe-eval'", "'unsafe-inline'", 'http://www.google-analytics.com', 'https://ssl.google-analytics.com')
+    csp.directives.connectSrc.push('https://www.google-analytics.com')
+    csp.directives.imgSrc.push('http://www.google-analytics.com', 'https://ssl.google-analytics.com')
   }
 
   // Exception for search in deprecated Enterprise docs <=2.12 (static site era)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/tests/content/lint-files.js b/tests/content/lint-files.js
diff --git a/tests/routing/deprecated-enterprise-versions.js b/tests/routing/deprecated-enterprise-versions.js
