From 653a57aa00a5ee6fe52b1dd14f5c3a0929f41e7c Mon Sep 17 00:00:00 2001 From: Jason Etcovitch Date: Fri, 29 Jan 2021 17:15:08 -0500 Subject: [PATCH 1/3] Don't use slugger singleton (#17579) --- lib/render-content/plugins/use-english-headings.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/render-content/plugins/use-english-headings.js b/lib/render-content/plugins/use-english-headings.js index 8348ea287ba5..4d2f36a041ed 100644 --- a/lib/render-content/plugins/use-english-headings.js +++ b/lib/render-content/plugins/use-english-headings.js @@ -2,7 +2,6 @@ const GithubSlugger = require('github-slugger') const Entities = require('html-entities').XmlEntities const toString = require('hast-util-to-string') const visit = require('unist-util-visit') -const slugger = new GithubSlugger() const entities = new Entities() const matcher = node => ( @@ -20,7 +19,7 @@ module.exports = function useEnglishHeadings ({ englishHeadings }) { // find English heading in the collection const englishHeading = englishHeadings[entities.encode(text)] // get English slug - const englishSlug = slugger.slug(englishHeading) + const englishSlug = GithubSlugger.slug(englishHeading) // use English slug for heading ID and link node.properties.id = englishSlug }) From 1bf93673eca10bb204252fcc3c16623ff9a654a0 Mon Sep 17 00:00:00 2001 From: Jason Etcovitch Date: Fri, 29 Jan 2021 17:25:50 -0500 Subject: [PATCH 2/3] Add release notes for GHES 3.0.0.rc2 (#17547) * Add 0-rc2 * Started adding release notes * added more line items * finished initial draft of enterprise 2 fix notes * some more line items added * updated known issues and took out rc1 fixes * added download link bug fix * added new known issues identified in rc2 * Fix a typo * Lint YAML * Tweak sorting for new version schem * Use today's date * removed links to PRs and reduced notes to most important ones * Fix indentation * bug_fixes => bugs * spruce it up * typo * update without changes Co-authored-by: Amulya Raja <53104849+amulyaraja@users.noreply.github.com> Co-authored-by: Maya Co-authored-by: Meg Bird --- data/release-notes/3-0/0-rc1.yml | 2 +- data/release-notes/3-0/0-rc2.yml | 23 +++++++++++++++++++ .../enterprise-release-notes.js | 5 ++-- 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 data/release-notes/3-0/0-rc2.yml diff --git a/data/release-notes/3-0/0-rc1.yml b/data/release-notes/3-0/0-rc1.yml index d38b93195b7b..8f280d3edd85 100644 --- 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 new file mode 100644 index 000000000000..5357fd478bac --- /dev/null +++ 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/middleware/contextualizers/enterprise-release-notes.js b/middleware/contextualizers/enterprise-release-notes.js index c3b6dda95508..c32891a2e74a 100644 --- 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 }) } From f2c08b31a83bc6fb5c0a89a402a33502fa920950 Mon Sep 17 00:00:00 2001 From: Jason Etcovitch Date: Fri, 29 Jan 2021 17:38:50 -0500 Subject: [PATCH 3/3] Static method isn't a thing on this version? (#17580) --- lib/render-content/plugins/use-english-headings.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/render-content/plugins/use-english-headings.js b/lib/render-content/plugins/use-english-headings.js index 4d2f36a041ed..fb181312ee49 100644 --- a/lib/render-content/plugins/use-english-headings.js +++ b/lib/render-content/plugins/use-english-headings.js @@ -2,6 +2,7 @@ const GithubSlugger = require('github-slugger') const Entities = require('html-entities').XmlEntities const toString = require('hast-util-to-string') const visit = require('unist-util-visit') +const slugger = new GithubSlugger() const entities = new Entities() const matcher = node => ( @@ -14,12 +15,13 @@ 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 const englishHeading = englishHeadings[entities.encode(text)] // get English slug - const englishSlug = GithubSlugger.slug(englishHeading) + const englishSlug = slugger.slug(englishHeading) // use English slug for heading ID and link node.properties.id = englishSlug })