diff --git a/.circleci/config.yml b/.circleci/config.yml index 6cec01c3..5651d933 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,24 +62,24 @@ workflows: filters: branches: only: - - master + - main - publish_release: requires: - node_modules filters: branches: only: - - master + - main - check_404s: requires: - publish_release filters: branches: only: - - master + - main experimental: notify: branches: only: - - master + - main diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ee17cb46..667af3c9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,7 +4,7 @@ Thanks for your interest in the project. Bugs filed and PRs submitted are apprec Please make sure that you are familiar with and follow the [Code of Conduct](https://allcontributors.org/docs/en/project/code-of-conduct) for this project. Also, please make sure you're familiar with and follow the instructions in the -[contributing guidelines](https://github.com/all-contributors/all-contributors/blob/master/CONTRIBUTING.md) (found in the CONTRIBUTING.md file). +[contributing guidelines](https://github.com/all-contributors/all-contributors/blob/main/CONTRIBUTING.md) (found in the CONTRIBUTING.md file). If you're new to contributing to open source projects, you might find this free video course helpful: http://kcd.im/pull-request diff --git a/.github/workflows/build-website.yml b/.github/workflows/build-website.yml index b9dc0ea6..00481a81 100644 --- a/.github/workflows/build-website.yml +++ b/.github/workflows/build-website.yml @@ -3,7 +3,7 @@ name: Deploy to GitHub Pages on: push: branches: - - master + - main jobs: build: name: Build Docusaurus diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2e283d41..2fd13529 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,7 +3,7 @@ name: Lint on: push: branches: - - master + - main pull_request: types: - opened diff --git a/README.md b/README.md index f5b4d524..c8398d1a 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ -[![Build Status](https://img.shields.io/circleci/project/all-contributors/all-contributors/master.svg)](https://circleci.com/gh/all-contributors/workflows/all-contributors/tree/master) +[![Build Status](https://img.shields.io/circleci/project/all-contributors/all-contributors/main.svg)](https://circleci.com/gh/all-contributors/workflows/all-contributors/tree/main) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/all-contributors/localized.svg)](https://crowdin.com/project/all-contributors) [![All Contributors](https://img.shields.io/github/all-contributors/all-contributors/all-contributors?color=ee8449&style=flat-square)](#contributors-) [![Netlify Status](https://api.netlify.com/api/v1/badges/e30784c5-9efd-4f20-8a47-13f3fb899613/deploy-status)](https://app.netlify.com/sites/allcontributors-org/deploys) diff --git a/docs/bot/configuration.md b/docs/bot/configuration.md index 6018ef2b..be7c4d1e 100644 --- a/docs/bot/configuration.md +++ b/docs/bot/configuration.md @@ -21,7 +21,7 @@ These are the keys you can specify: | `files` | Array of files to update. | Default: `['README.md']` | | `imageSize` | Size (in px) of the user's avatar. | Default: `100` | | `commit` | Auto-commit badge when adding contributors. | Default: `false` | -| `commitConvention` | Commit convention ([`angular`](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit), [`atom`](https://github.com/atom/atom/blob/master/CONTRIBUTING.md#git-commit-messages), [`ember`](https://guides.emberjs.com/v1.10.0/contributing/#toc_commits), [`eslint`](https://eslint.org/docs/latest/contribute/pull-requests#step2), [`jshint`](https://jshint.com/contribute/), [`gitmoji`](https://gitmoji.carloscuesta.me/), or `none`). | Default: `angular` | +| `commitConvention` | Commit convention ([`angular`](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit), [`atom`](https://github.com/atom/atom/blob/main/CONTRIBUTING.md#git-commit-messages), [`ember`](https://guides.emberjs.com/v1.10.0/contributing/#toc_commits), [`eslint`](https://eslint.org/docs/latest/contribute/pull-requests#step2), [`jshint`](https://jshint.com/contribute/), [`gitmoji`](https://gitmoji.carloscuesta.me/), or `none`). | Default: `angular` | | `contributorsPerLine` | Maximum number of columns for the contributors table. | Default: `7` | | `contributorsSortAlphabetically` | `true`: Sort alphabetically. `false`: Display in order of addition. | Default: `false` | | `badgeTemplate` | Define your own lodash template to generate the badge. | | diff --git a/docs/bot/usage.md b/docs/bot/usage.md index e9fb8514..ca110dbb 100644 --- a/docs/bot/usage.md +++ b/docs/bot/usage.md @@ -39,7 +39,7 @@ The bot will then create a Pull Request to add the contributor, then reply with Example usage screenshot -> Your request to the bot doesn't need to be perfect. The bot will use [basic Natural Language Parsing](https://github.com/all-contributors/app/blob/master/lib/parse-comment.js) to determine your intent. +> Your request to the bot doesn't need to be perfect. The bot will use [basic Natural Language Parsing](https://github.com/all-contributors/app/blob/main/lib/parse-comment.js) to determine your intent. > For example, this will work too: > > `Jane you are crushing it in the documentation and your infrastructure work has been great too. Let's add @jane.doe23 for her contributions. cc @all-contributors` diff --git a/docs/emoji-key.md b/docs/emoji-key.md index 3a6a473f..1ab2c438 100644 --- a/docs/emoji-key.md +++ b/docs/emoji-key.md @@ -6,7 +6,7 @@ sidebar_label: Emoji Key ✨ ## Table -> To have a contribution added when using the [Bot](bot/overview) or [CLI](cli/overview) use the keyword in the `Type` column. The bot will also use [basic Natural Language Parsing](https://github.com/all-contributors/app/blob/master/lib/parse-comment.js) to determine your contribution intent. +> To have a contribution added when using the [Bot](bot/overview) or [CLI](cli/overview) use the keyword in the `Type` column. The bot will also use [basic Natural Language Parsing](https://github.com/all-contributors/app/blob/main/lib/parse-comment.js) to determine your contribution intent. Emoji/Type | Represents | Comments | :---: | :---: | :---: | diff --git a/docs/project/contribute.md b/docs/project/contribute.md index c12d207c..269603ef 100644 --- a/docs/project/contribute.md +++ b/docs/project/contribute.md @@ -11,11 +11,11 @@ sidebar_label: Help us Improve Thanks for your interest in the project! Pull Requests welcome for any level of improvement, from a small typo to a new section, help us make the project better -All the source code is available at [github.com/all-contributors/all-contributors](https://github.com/all-contributors/all-contributors/tree/master/docs) +All the source code is available at [github.com/all-contributors/all-contributors](https://github.com/all-contributors/all-contributors/tree/main/docs) ## Committing to an all-contributors repo -We use the [angular commit convention](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines) for commits that are used for an automated changelog generation, so it would be advisable to respect that. +We use the [angular commit convention](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-guidelines) for commits that are used for an automated changelog generation, so it would be advisable to respect that. If you're not used to it or are afraid to mistype a commit, you can run `npm run commit` or `git cz` (if you have installed `commitizen`) which would take you through a few questions and write the commit for you. ## Editing Content @@ -60,7 +60,7 @@ After you translate strings in any given language, you won't see those changes a ## Search -Search is by algolia, the configuration is at +Search is by algolia, the configuration is at ## Run the website locally: diff --git a/website/siteConfig.js b/website/siteConfig.js index 8b9135c7..d99e5b34 100644 --- a/website/siteConfig.js +++ b/website/siteConfig.js @@ -7,7 +7,7 @@ const siteConfig = { projectName: 'all-contributors', organizationName: 'all-contributors', // End deploy options - editUrl: 'https://github.com/all-contributors/all-contributors/tree/master/docs/', + editUrl: 'https://github.com/all-contributors/all-contributors/tree/main/docs/', headerLinks: [ { doc: 'overview', label: 'Docs' }, { href: "https://github.com/all-contributors/all-contributors", label: "GitHub" },