Skip to content

Commit abb2768

Browse files
authored
chore: Remove term master from repository (#638)
* chore: Remove term master from repository * Re-add examples to lerna config * Remove mentions of master from examples
1 parent 983769c commit abb2768

File tree

10 files changed

+18
-19
lines changed

10 files changed

+18
-19
lines changed

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
language: node_js
22

33
os:
4-
- windows
5-
- linux
6-
- osx
4+
- windows
5+
- linux
6+
- osx
77

88
node_js:
9-
- "lts/dubnium"
10-
- "lts/erbium"
9+
- 'lts/dubnium'
10+
- 'lts/erbium'
1111
sudo: false
1212

1313
before_script:
14-
- npm run bootstrap
14+
- npm run bootstrap
1515

1616
git:
17-
autocrlf: input
17+
autocrlf: input

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<img src="https://img.shields.io/npm/dm/@frctl/fractal" alt="">
2929
</a>
3030
<!-- License -->
31-
<a href="https://github.com/frctl/fractal/blob/master/LICENSE" title="MIT license">
31+
<a href="https://github.com/frctl/fractal/blob/main/LICENSE" title="MIT license">
3232
<img alt="GitHub" src="https://img.shields.io/github/license/frctl/fractal">
3333
</a>
3434
</div>
@@ -108,7 +108,7 @@ If you rather have a question, please ask it on [our Discord server](https://dis
108108

109109
### Submitting pull requests
110110

111-
We will always welcome pull requests on any of the [frctl organisation](https://github.com/frctl) repositories. Please submit PRs against `master` branch with an explanation of your intention.
111+
We will always welcome pull requests on any of the [frctl organisation](https://github.com/frctl) repositories. Please submit PRs against `main` branch with an explanation of your intention.
112112

113113
We use [conventional commits](https://www.conventionalcommits.org/), which means that every pull request title should conform to the standard.
114114

@@ -156,6 +156,6 @@ This project follows the [all-contributors](https://github.com/all-contributors/
156156

157157
## License
158158

159-
[MIT](https://github.com/frctl/fractal/blob/master/LICENSE)
159+
[MIT](https://github.com/frctl/fractal/blob/main/LICENSE)
160160

161161
[docs]: https://fractal.build

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"command": {
33
"version": {
4-
"allowBranch": "master",
4+
"allowBranch": "main",
55
"message": "chore: publish"
66
}
77
},

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"bugs": {
1313
"url": "https://github.com/frctl/fractal/issues"
1414
},
15-
"homepage": "https://github.com/frctl/fractal/tree/master/packages/core",
15+
"homepage": "https://github.com/frctl/fractal/tree/main/packages/core",
1616
"dependencies": {
1717
"@allmarkedup/fang": "^1.0.0",
1818
"anymatch": "^2.0.0",

packages/handlebars/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"bugs": {
1414
"url": "https://github.com/frctl/fractal/issues"
1515
},
16-
"homepage": "https://github.com/frctl/fractal/tree/master/packages/handlebars",
16+
"homepage": "https://github.com/frctl/fractal/tree/main/packages/handlebars",
1717
"dependencies": {
1818
"@frctl/core": "^0.0.0",
1919
"bluebird": "^3.5.2",

packages/mandelbrot/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ You can also build the files once with:
3131
npm run build
3232
```
3333

34-
You can see your changes in one of our [example Fractal instances](https://github.com/frctl/fractal/tree/master/examples).
34+
You can see your changes in one of our [example Fractal instances](https://github.com/frctl/fractal/tree/main/examples).

packages/nunjucks/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
"type": "git",
88
"url": "https://github.com/frctl/fractal.git",
99
"directory": "packages/nunjucks"
10-
1110
},
1211
"author": "Mark Perkins <[email protected]> (http://clearleft.com/)",
1312
"license": "MIT",
1413
"bugs": {
1514
"url": "https://github.com/frctl/fractal/issues"
1615
},
17-
"homepage": "https://github.com/frctl/fractal/tree/master/packages/nunjucks",
16+
"homepage": "https://github.com/frctl/fractal/tree/main/packages/nunjucks",
1817
"peerDependencies": {
1918
"@frctl/fractal": ">= 1.1.0-alpha.0 < 2"
2019
},

packages/twig/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"bugs": {
1414
"url": "https://github.com/frctl/fractal/issues"
1515
},
16-
"homepage": "https://github.com/frctl/fractal/tree/master/packages/twig",
16+
"homepage": "https://github.com/frctl/fractal/tree/main/packages/twig",
1717
"dependencies": {
1818
"@frctl/core": "^0.0.0",
1919
"lodash": "^4.17.11",

packages/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"bugs": {
1313
"url": "https://github.com/frctl/fractal/issues"
1414
},
15-
"homepage": "https://github.com/frctl/fractal/tree/master/packages/web",
15+
"homepage": "https://github.com/frctl/fractal/tree/main/packages/web",
1616
"dependencies": {
1717
"@frctl/core": "^0.0.0",
1818
"anymatch": "^2.0.0",

packages/web/views/__system/index.nunj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
{% block body %}
88

9-
<p>It looks like you probably need to <a href="https://github.com/frctl/fractal/blob/master/docs/web/themes.md">install a theme</a>.</p>
9+
<p>It looks like you probably need to <a href="https://fractal.build/guide/customisation/web-themes.html#configuring-themes">install a theme</a>.</p>
1010

1111
<p>If you are developing your own theme and are seeing this message, then you need to register a route handler for the homepage.</p>
1212

0 commit comments

Comments
 (0)