Merge branch 'main' into repo-sync

rachmari · web-flow · commit 37f044e26853 · 2021-01-29T18:39:10.000-08:00
diff --git a/data/release-notes/3-0/0-rc1.yml b/data/release-notes/3-0/0-rc1.yml
@@ -1,6 +1,6 @@
 date: '2021-01-12'
 release_candidate: true
-intro: Release notes are now published on the documentation site. The new location makes it easier to learn about new releases and features at the same time. Historical release notes are available on [GitHub Enterprise Releases](https://enterprise.github.com/releases).
+intro: Release candidate versions should be tested on non-production environments. For more information about the Release Candidate Program, see the [GitHub Blog](https://github.blog/2020-12-03-improving-the-ghes-release-process-release-candidates/) or "[About upgrades to new releases](/admin/overview/about-upgrades-to-new-releases)".
 sections:
   features:
     - heading: GitHub Actions
diff --git a/data/release-notes/3-0/0-rc2.yml b/data/release-notes/3-0/0-rc2.yml
@@ -0,0 +1,23 @@
+date: '2021-01-29'
+release_candidate: true
+intro: Release candidate versions should be tested on non-production environments. For more information about the Release Candidate Program, see the [GitHub Blog](https://github.blog/2020-12-03-improving-the-ghes-release-process-release-candidates/) or "[About upgrades to new releases](/admin/overview/about-upgrades-to-new-releases)."
+sections:
+  bugs:
+    - heading: Fixes for known issues from Release Candidate 1
+      notes:
+        - If you disabled GitHub Actions following an unsuccessful attempt to set up GitHub Actions, then you will not be able to create the first user and use the appliance.
+        - The "Mandatory message viewed" audit log event was not being saved.
+        - '`ghe-config-apply` needed to run on a replica during an initial setup before `ghe-repl-setup` could run to start replication.'
+        - Removing yourself as an enterprise owner returned a 404.
+    - heading: Fixes for other issues
+      notes:
+        - Issues with migrations and upgrades to 3.0.0 have been fixed.
+        - Backup Utilities versioning now works for release candidate versions.
+        - Generating a support bundle resulted in an error in the orchestrator logs.
+        - A large restore could result in Redis running out of memory.
+        - The checkbox to enable GitHub Actions in the Management Console is now visible with any authentication method.
+        - GitHub Actions can only be enabled if the required storage is also configured.
+        - '`ghe-repl-status` could silently fail if MSSQL replication is not configured.'
+
+  known_issues:
+    - The known issues for Release Candidate 1 still apply, excluding the bug fixes listed.
diff --git a/lib/render-content/plugins/use-english-headings.js b/lib/render-content/plugins/use-english-headings.js
@@ -15,6 +15,7 @@ module.exports = function useEnglishHeadings ({ englishHeadings }) {
   if (!englishHeadings) return
   return tree => {
     visit(tree, matcher, node => {
+      slugger.reset()
       // Get the plain text content of the heading node
       const text = toString(node)
       // find English heading in the collection
diff --git a/middleware/contextualizers/enterprise-release-notes.js b/middleware/contextualizers/enterprise-release-notes.js
@@ -1,4 +1,3 @@
-const semver = require('semver')
 const renderContent = require('../../lib/render-content')
 const patterns = require('../../lib/patterns')
 const enterpriseReleases = require('../../lib/enterprise-server-releases').supported
@@ -20,8 +19,8 @@ function sortPatchKeys (release, version) {
     })
   return keys
     .sort((a, b) => {
-      if (semver.gt(a.version, b.version)) return -1
-      if (semver.lt(a.version, b.version)) return 1
+      if (a.version > b.version) return -1
+      if (a.version < b.version) return 1
       return 0
     })
 }
