Skip to content

Commit 0a99aef

Browse files
authored
feat: rename default branch from master to main (#2077)
1 parent cee5e0d commit 0a99aef

File tree

12 files changed

+16
-28
lines changed

12 files changed

+16
-28
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Thanks for submitting a pull request!
33
44
Please make sure you've read and understood our contributing guidelines;
5-
https://github.com/netlify/netlify-cms/blob/master/CONTRIBUTING.md
5+
https://github.com/netlify/netlify-cli/blob/main/CONTRIBUTING.md
66
77
If this is a bug fix, make sure your description includes "fixes #xxxx", or
88
"closes #xxxx", where #xxxx is the issue number.

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Dependency License Scanning
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- fossa
88

99
defaults:

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Testing for CLI
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
build:

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: release-please
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
jobs:
77
release-please:
88
runs-on: ubuntu-latest

.github/workflows/verify-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Verify Docs
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
build:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ We also test for a few other things:
8383

8484
We actively welcome your pull requests.
8585

86-
1. Fork the repo and create your branch from `master`.
86+
1. Fork the repo and create your branch from `main`.
8787
2. If you've added code that should be tested, add tests.
8888
3. If you've changed APIs, update the documentation.
8989
4. Run `npm test` to run linting, formatting and tests.
@@ -92,7 +92,7 @@ We actively welcome your pull requests.
9292
## Releasing
9393

9494
1. Merge the release PR
95-
2. Switch to the default branch `git checkout master`
95+
2. Switch to the default branch `git checkout main`
9696
3. Pull latest changes `git pull`
9797
4. Publish the package `npm publish`
9898

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# ![Netlify CLI](cli.png)
22

3-
[![Coverage Status](https://codecov.io/gh/netlify/cli/branch/master/graph/badge.svg)](https://codecov.io/gh/netlify/cli)
3+
[![Coverage Status](https://codecov.io/gh/netlify/cli/branch/main/graph/badge.svg)](https://codecov.io/gh/netlify/cli)
44
[![npm version][npm-img]][npm] [![downloads][dl-img]][dl] [![netlify-status][netlify-img]][netlify] [![dependencies][david-img]][david] [![security][snyk-img]][snyk][![FOSSA Status](https://app.fossa.com/api/projects/custom%2B17679%2Fgit%40github.com%3Anetlify%2Fcli.git.svg?type=shield)](https://app.fossa.com/projects/custom%2B17679%2Fgit%40github.com%3Anetlify%2Fcli.git?ref=badge_shield)
55

66
Interact with [Netlify](http://netlify.com/) from the comfort of your CLI.
77

8-
See the [CLI command line reference](https://cli.netlify.com/commands/) to get started and the docs on using [Netlify Dev](https://github.com/netlify/cli/blob/master/docs/netlify-dev.md) to run your site locally.
8+
See the [CLI command line reference](https://cli.netlify.com/commands/) to get started and the docs on using [Netlify Dev](https://github.com/netlify/cli/blob/main/docs/netlify-dev.md) to run your site locally.
99

1010
## Table of Contents
1111

codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
codecov:
2-
strict_yaml_branch: master
2+
strict_yaml_branch: main
33
coverage:
44
range: [80, 100]
55
parsers:

docs/netlify-dev.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Netlify Dev is meant to work with zero config for the majority of users, by usin
124124

125125
Netlify Dev will attempt to detect the site generator or build command that you are using, and run these on your behalf, while adding other development utilities. If you have a JavaScript project, it looks for the best `package.json` script to run for you, using simple heuristics, so you can use the full flexibility of npm scripts. We may add more intelligence to this in the future.
126126

127-
**Overriding the detectors**: The number of [project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/master/src/detectors) is growing, but if yours is not yet supported (contributions welcome!), you can instruct Netlify Dev to run the project on your behalf by declaring it in a `[dev]` block of your `netlify.toml` file.
127+
**Overriding the detectors**: The number of [project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/main/src/detectors) is growing, but if yours is not yet supported (contributions welcome!), you can instruct Netlify Dev to run the project on your behalf by declaring it in a `[dev]` block of your `netlify.toml` file.
128128

129129
```toml
130130
# sample dev block in the toml
@@ -146,7 +146,7 @@ against your project.
146146
```
147147

148148
The `framework` option should be one of the available
149-
[project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/master/src/detectors)
149+
[project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/main/src/detectors)
150150
or `#auto` (default) to test all available detectors, `#static` for a static
151151
file server or `#custom` to use `command` option to run an app server and
152152
`targetPort` option to connect to it.

site/src/_layout.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -411,18 +411,6 @@ export default class Layout extends React.Component {
411411
<HitBoxWrapper>
412412
<MyHits />
413413
</HitBoxWrapper>
414-
{/* <EditLink>
415-
<a
416-
style={{
417-
color: '#333',
418-
textDecoration: 'none',
419-
fontSize: '12px'
420-
}}
421-
href={`${repoUrl}/edit/master/docs/${this.props.route.key}`}
422-
>
423-
Edit this doc <GithubIcon/>
424-
</a>
425-
</EditLink> */}
426414
<Wrapper>
427415
<Content>
428416
<div className="doc-content">{children}</div>

0 commit comments

Comments
 (0)