Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename default branch from master to main #333

Merged
merged 2 commits into from
Apr 6, 2022
Merged

Rename default branch from master to main #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ace9bbc
Rename default branch from master to main
christian-bromann Apr 4, 2022
fb44b8e
rename test workflow
christian-bromann Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
### Please refer to the [EditorConfig Code of Conduct](https://github.com/editorconfig/editorconfig/blob/master/CODE_OF_CONDUCT.md).
### Please refer to the [EditorConfig Code of Conduct](https://github.com/editorconfig/editorconfig/blob/main/CODE_OF_CONDUCT.md)
6 changes: 3 additions & 3 deletions .github/workflows/master.yml → .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Node CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
test:
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
npm test
env:
CI: true
DISPLAY: ':99.0'
DISPLAY: ":99.0"

release:
name: vsce publish
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
## 0.3.4

- [Use
`onWillSaveTextDocument`]https://github.com/editorconfig/editorconfig-vscode/pull/80,
`onWillSaveTextDocument`]<https://github.com/editorconfig/editorconfig-vscode/pull/80>,
fixes [`#76`](https://github.com/editorconfig/editorconfig-vscode/issues/76)
and [`#79`](https://github.com/editorconfig/editorconfig-vscode/issues/79)
(thanks [`@SamVerschueren`](https://github.com/SamVerschueren))!
Expand Down Expand Up @@ -260,7 +260,7 @@

- [Fix applying transformations to .editorconfig itself](https://github.com/editorconfig/editorconfig-vscode/issues/9)
(thanks [`@SamVerschueren`](https://github.com/SamVerschueren))!
- [Fix marketplace icon](https://github.com/editorconfig/editorconfig-vscode/commits/master)
- [Fix marketplace icon](https://github.com/editorconfig/editorconfig-vscode/commits/main)
(thanks [`@SamVerschueren`](https://github.com/SamVerschueren))!

## 0.2.2
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"config",
"multi-root ready"
],
"homepage": "https://github.com/editorconfig/editorconfig-vscode/blob/master/README.md",
"homepage": "https://github.com/editorconfig/editorconfig-vscode/blob/main/README.md",
"repository": {
"type": "git",
"url": "https://github.com/editorconfig/editorconfig-vscode.git"
Expand Down