diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ff7cebb74a..a2dfa52b00 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,7 +3,7 @@ name: Build & Tests on: push: branches: - - master + - main paths-ignore: - website/** diff --git a/.github/workflows/generate-docs.yaml b/.github/workflows/generate-docs.yaml index 64ea6faf95..0bba02af07 100644 --- a/.github/workflows/generate-docs.yaml +++ b/.github/workflows/generate-docs.yaml @@ -3,7 +3,7 @@ name: Generate documentation on: push: branches: - - master + - main paths: - website/** @@ -24,4 +24,4 @@ jobs: GH_NAME: 'ivarconr' GH_EMAIL: 'ivarconr@gmail.com' GH_TOKEN: ${{ secrets.GH_TOKEN }} - DEPLOYMENT_BRANCH: 'master' + DEPLOYMENT_BRANCH: 'main' diff --git a/README.md b/README.md index d90ce66765..5fc5fdd7ae 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@
-![Build & Tests](https://github.com/Unleash/unleash/workflows/Build%20%26%20Tests/badge.svg?branch=master) [![Coverage Status](https://coveralls.io/repos/github/Unleash/unleash/badge.svg?branch=master&)](https://coveralls.io/github/Unleash/unleash?branch=master) [![npm](https://img.shields.io/npm/v/unleash-server)](https://www.npmjs.com/package/unleash-server) [![Docker Pulls](https://img.shields.io/docker/pulls/unleashorg/unleash-server)](https://hub.docker.com/r/unleashorg/unleash-server) - -[![Deploy to Heroku](./.github/deploy-heroku-20.png)](https://www.heroku.com/deploy/?template=https://github.com/Unleash/unleash) [![Deploy to DigitalOcean](./.github/deploy-digital.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Unleash/unleash/tree/master&refcode=0e1d75187044) [![Twitter Follow](https://img.shields.io/twitter/follow/getunleash)](https://twitter.com/intent/follow?screen_name=getunleash) +![Build & Tests](https://github.com/Unleash/unleash/workflows/Build%20%26%20Tests/badge.svg?branch=main) [![Coverage Status](https://coveralls.io/repos/github/Unleash/unleash/badge.svg?branch=main&)](https://coveralls.io/github/Unleash/unleash?branch=main) [![npm](https://img.shields.io/npm/v/unleash-server)](https://www.npmjs.com/package/unleash-server) [![Docker Pulls](https://img.shields.io/docker/pulls/unleashorg/unleash-server)](https://hub.docker.com/r/unleashorg/unleash-server) +[![Deploy to Heroku](./.github/deploy-heroku-20.png)](https://www.heroku.com/deploy/?template=https://github.com/Unleash/unleash) [![Deploy to DigitalOcean](./.github/deploy-digital.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Unleash/unleash/tree/main&refcode=0e1d75187044) [![Twitter Follow](https://img.shields.io/twitter/follow/getunleash)](https://twitter.com/intent/follow?screen_name=getunleash) diff --git a/app.json b/app.json index d034f09db1..67ad0584da 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,7 @@ "name": "Unleash", "description": "A default setup of Unleash", "repository": "https://github.com/heroku/node-js-sample", - "logo": "https://github.com/Unleash/unleash/blob/master/.github/logo.png?raw=true", + "logo": "https://github.com/Unleash/unleash/blob/main/.github/logo.png?raw=true", "keywords": ["node", "feature toggles", "release"], "addons": [ { diff --git a/website/docs/user_guide/quickstart.md b/website/docs/user_guide/quickstart.md index 5ea0d6481b..3a75da90f0 100644 --- a/website/docs/user_guide/quickstart.md +++ b/website/docs/user_guide/quickstart.md @@ -123,7 +123,7 @@ If you want to set up your own instance for testing purposes you can easily do s > You'll receive $100 in free credits if you are a new DigitalOcean user using this link. -[![Deploy to DigitalOcean](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Unleash/unleash/tree/master&refcode=0e1d75187044) +[![Deploy to DigitalOcean](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Unleash/unleash/tree/main&refcode=0e1d75187044) ### Accessing your new instance diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 881678bb27..906d0dc2e1 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -108,7 +108,7 @@ module.exports = { sidebarPath: require.resolve('./sidebars.js'), // Please change this to your repo. editUrl: - 'https://github.com/Unleash/unleash/edit/master/website/', + 'https://github.com/Unleash/unleash/edit/main/website/', routeBasePath: '/', remarkPlugins: [ [require('@docusaurus/remark-plugin-npm2yarn'), {sync: true}] diff --git a/website/static/README.md b/website/static/README.md index 4ccf2ab2ba..1724f2843a 100644 --- a/website/static/README.md +++ b/website/static/README.md @@ -1,4 +1,4 @@ -The Unleash website was created with [Docusaurus](https://docusaurus.io/). The source code lives as part of the main [Unleash repo on GitHub](https://github.com/Unleash/unleash) and is built and deployed on all merges to master. This makes it easy to keep the documentation in sync with the latest version of Unleash. +The Unleash website was created with [Docusaurus](https://docusaurus.io/). The source code lives as part of the main [Unleash repo on GitHub](https://github.com/Unleash/unleash) and is built and deployed on all merges to main. This makes it easy to keep the documentation in sync with the latest version of Unleash. It's hosted on https://docs.getunleash.io