Skip to content

Commit

Permalink
chore(): change branch from master to main accross the codebase (#7154)
Browse files Browse the repository at this point in the history
  • Loading branch information
demshy committed Mar 21, 2024
1 parent 9e18ffb commit 2c847d5
Show file tree
Hide file tree
Showing 109 changed files with 2,487 additions and 2,487 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -2,7 +2,7 @@
Thanks for submitting a pull request!
Please make sure you've read and understood our contributing guidelines here:
https://github.com/decaporg/decap-cms/blob/master/CONTRIBUTING.md
https://github.com/decaporg/decap-cms/blob/main/CONTRIBUTING.md
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx", where #xxxx is the issue number.
Expand All @@ -29,6 +29,6 @@ Example: The exact commands you ran and their output, screenshots / videos if th

Please add a `x` inside each checkbox:

- [ ] I have read the [contribution guidelines](https://github.com/decaporg/decap-cms/blob/master/CONTRIBUTING.md).
- [ ] I have read the [contribution guidelines](https://github.com/decaporg/decap-cms/blob/main/CONTRIBUTING.md).

**A picture of a cute animal (not mandatory but encouraged)**
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Expand Up @@ -3,7 +3,7 @@ name: Node CI
on:
push:
branches:
- master
- main
pull_request:
types: [opened, synchronize, reopened]

Expand Down
50 changes: 25 additions & 25 deletions CHANGELOG.md
Expand Up @@ -3,45 +3,45 @@ Decap CMS is a collection of npm packages with their own versions and changelogs
below. The legacy pre-2.0 changelog is below as well.

## Core and distributions
- [decap-cms](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms/CHANGELOG.md)
- [decap-cms-core](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-core/CHANGELOG.md)
- [decap-cms](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms/CHANGELOG.md)
- [decap-cms-core](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-core/CHANGELOG.md)

## Shared libraries
- [decap-cms-lib-auth](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-lib-auth/CHANGELOG.md)
- [decap-cms-lib-util](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-lib-util/CHANGELOG.md)
- [decap-cms-ui-default](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-ui-default/CHANGELOG.md)
- [decap-cms-lib-auth](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-lib-auth/CHANGELOG.md)
- [decap-cms-lib-util](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-lib-util/CHANGELOG.md)
- [decap-cms-ui-default](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-ui-default/CHANGELOG.md)

## Backends
- [decap-cms-backend-bitbucket](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-bitbucket/CHANGELOG.md)
- [decap-cms-backend-git-gateway](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-git-gateway/CHANGELOG.md)
- [decap-cms-backend-github](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-github/CHANGELOG.md)
- [decap-cms-backend-gitlab](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-gitlab/CHANGELOG.md)
- [decap-cms-backend-test](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-test/CHANGELOG.md)
- [decap-cms-backend-bitbucket](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-bitbucket/CHANGELOG.md)
- [decap-cms-backend-git-gateway](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-git-gateway/CHANGELOG.md)
- [decap-cms-backend-github](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-github/CHANGELOG.md)
- [decap-cms-backend-gitlab](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-gitlab/CHANGELOG.md)
- [decap-cms-backend-test](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-test/CHANGELOG.md)

## Editor Components
- [decap-cms-editor-component-image](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-editor-component-image/CHANGELOG.md)
- [decap-cms-editor-component-image](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-editor-component-image/CHANGELOG.md)

## Widgets
- [decap-cms-widget-boolean](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-boolean/CHANGELOG.md)
- [decap-cms-widget-date](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-date/CHANGELOG.md)
- [decap-cms-widget-datetime](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-datetime/CHANGELOG.md)
- [decap-cms-widget-file](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-file/CHANGELOG.md)
- [decap-cms-widget-image](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-image/CHANGELOG.md)
- [decap-cms-widget-list](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-list/CHANGELOG.md)
- [decap-cms-widget-markdown](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-markdown/CHANGELOG.md)
- [decap-cms-widget-number](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-number/CHANGELOG.md)
- [decap-cms-widget-object](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-object/CHANGELOG.md)
- [decap-cms-widget-relation](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-relation/CHANGELOG.md)
- [decap-cms-widget-select](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-select/CHANGELOG.md)
- [decap-cms-widget-string](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-string/CHANGELOG.md)
- [decap-cms-widget-text](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-text/CHANGELOG.md)
- [decap-cms-widget-boolean](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-boolean/CHANGELOG.md)
- [decap-cms-widget-date](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-date/CHANGELOG.md)
- [decap-cms-widget-datetime](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-datetime/CHANGELOG.md)
- [decap-cms-widget-file](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-file/CHANGELOG.md)
- [decap-cms-widget-image](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-image/CHANGELOG.md)
- [decap-cms-widget-list](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-list/CHANGELOG.md)
- [decap-cms-widget-markdown](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-markdown/CHANGELOG.md)
- [decap-cms-widget-number](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-number/CHANGELOG.md)
- [decap-cms-widget-object](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-object/CHANGELOG.md)
- [decap-cms-widget-relation](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-relation/CHANGELOG.md)
- [decap-cms-widget-select](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-select/CHANGELOG.md)
- [decap-cms-widget-string](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-string/CHANGELOG.md)
- [decap-cms-widget-text](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-text/CHANGELOG.md)

## Legacy Changelog

## [Unreleased] ([demo](https://cms-demo.netlify.com/))
<details>
<summary>
Changes that have landed in master but are not yet released.
Changes that have landed in main but are not yet released.
Click to see more.
</summary>

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -103,10 +103,10 @@ We actively welcome your pull requests!

If you need help with Git or our workflow, please ask in our [community chat](https://decapcms.org/chat). We want your contributions even if you're just learning Git. Our maintainers are happy to help!

Decap CMS uses the [Forking Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow) + [Feature Branches](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow). Additionally, PR's should be [rebased](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) on master when opened, and again before merging.
Decap CMS uses the [Forking Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow) + [Feature Branches](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow). Additionally, PR's should be [rebased](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) on main when opened, and again before merging.

1. Fork the repo.
2. Create a branch from `master`. If you're addressing a specific issue, prefix your branch name with the issue number.
2. Create a branch from `main`. If you're addressing a specific issue, prefix your branch name with the issue number.
3. If you've added code that should be tested, add tests.
4. If you've changed APIs, update the documentation.
5. Run `npm run test` and ensure the test suite passes.
Expand Down
4 changes: 2 additions & 2 deletions README.md
@@ -1,6 +1,6 @@
![Decap CMS](/img/decap.svg)

[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/decaporg/decap-cms/blob/master/LICENSE) [![Netlify Status](https://api.netlify.com/api/v1/badges/8b87160b-0a11-4f75-8050-1d21bc1cff8c/deploy-status)](https://app.netlify.com/sites/decap-www/deploys) [![npm version](https://img.shields.io/npm/v/decap-cms.svg?style=flat)](https://www.npmjs.com/package/decap-cms) [![Build Status](https://github.com/decaporg/decap-cms/workflows/Node%20CI/badge.svg)](https://github.com/decaporg/decap-cms/actions?query=branch%3Amaster+workflow%3A%22Node+CI%22) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/decaporg/decap-cms/blob/master/CONTRIBUTING.md)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/decaporg/decap-cms/blob/main/LICENSE) [![Netlify Status](https://api.netlify.com/api/v1/badges/8b87160b-0a11-4f75-8050-1d21bc1cff8c/deploy-status)](https://app.netlify.com/sites/decap-www/deploys) [![npm version](https://img.shields.io/npm/v/decap-cms.svg?style=flat)](https://www.npmjs.com/package/decap-cms) [![Build Status](https://github.com/decaporg/decap-cms/workflows/Node%20CI/badge.svg)](https://github.com/decaporg/decap-cms/actions?query=branch%3Amain+workflow%3A%22Node+CI%22) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/decaporg/decap-cms/blob/main/CONTRIBUTING.md)

[decapcms.org](https://www.decapcms.org/)

Expand Down Expand Up @@ -37,7 +37,7 @@ The Decap CMS can be used in two different ways.

## Contributing

New contributors are always welcome! Check out [CONTRIBUTING.md](https://github.com/decaporg/decap-cms/blob/master/CONTRIBUTING.md) to get involved.
New contributors are always welcome! Check out [CONTRIBUTING.md](https://github.com/decaporg/decap-cms/blob/main/CONTRIBUTING.md) to get involved.

## Change Log

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Expand Up @@ -5,7 +5,7 @@
"loglevel": "success",
"command": {
"version": {
"allowBranch": ["master", "release/*"],
"allowBranch": ["main", "release/*"],
"conventionalCommits": true,
"preid": "beta",
"gitRemote": "upstream",
Expand Down

0 comments on commit 2c847d5

Please sign in to comment.