From 28d7f101135d9fb8e68496369ca9d91d351e827f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B8ran=20A=2E=20Slettemark?= Date: Thu, 5 Dec 2024 12:18:34 +0100 Subject: [PATCH] Changed references to the hc master branch to main --- lib/readme.md | 1 - public/modules/pulls.js | 4 ++-- readme.md | 2 +- routes/bisect/commits.js | 2 +- views/samples/share.hbs | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/readme.md b/lib/readme.md index fdfe69d..6f554d2 100644 --- a/lib/readme.md +++ b/lib/readme.md @@ -3,6 +3,5 @@ * Use the icon next to the sample to either compare against a previous version, or to run a unit test. Unit tests are marked with a jigsaw puzzle icon. * By default, visual tests compare against the latest stable release. -* See the Github readme file for guidelines on setting up the tests. For testing mobile and legacy browsers, check out the simplified mobile samples. diff --git a/public/modules/pulls.js b/public/modules/pulls.js index 2c346cc..cd6903a 100644 --- a/public/modules/pulls.js +++ b/public/modules/pulls.js @@ -272,7 +272,7 @@ const renderPull = pull => { `; - if (!pull.base || pull.base.ref == 'master') { + if (!pull.base || pull.base.ref == 'main') { if (pull.decoration?.newInteractions) { // !undefined or > 0 li.innerHTML += ` @@ -461,4 +461,4 @@ const runUpdate = async () => { } }); -})(); \ No newline at end of file +})(); diff --git a/readme.md b/readme.md index 61e3b7d..dcc652c 100644 --- a/readme.md +++ b/readme.md @@ -43,7 +43,7 @@ or an equivalent command. The options that are handled at the runtime set through "Session settings" (explained above) have precedence over the CLI arguments. -See [highcharts/samples](https://github.com/highcharts/highcharts/tree/master/samples) +See [highcharts/samples](https://github.com/highcharts/highcharts/tree/main/samples) for description of how the samples are set up and how to use the utils. The server `code.highcharts.local` is serving files locally from the `/code` diff --git a/routes/bisect/commits.js b/routes/bisect/commits.js index 0705b5c..c818f5a 100644 --- a/routes/bisect/commits.js +++ b/routes/bisect/commits.js @@ -75,7 +75,7 @@ router.get('/', function(req, res) { tpl.branches = Object.keys(log.branches).map(name => ({ name: name, - selected: (req.session.branch || 'master') === name ? + selected: (req.session.branch || 'main') === name ? 'selected' : '' })); diff --git a/views/samples/share.hbs b/views/samples/share.hbs index 563a4b8..df8ac74 100644 --- a/views/samples/share.hbs +++ b/views/samples/share.hbs @@ -27,9 +27,9 @@

Stable demo (preferred)

- Fiddle with demo files from GitHub master branch and Highcharts from latest stable (code.highcharts.com). + Fiddle with demo files from GitHub main branch and Highcharts from latest stable (code.highcharts.com).

- jsFiddle @@ -79,4 +79,4 @@ Right click to copy - \ No newline at end of file +