Skip to content

Commit cfe3c3f

Browse files
committed
Switch to main branch
This changes all references to the `master` branch in the repository to `main` in anticipation of changing the default branch on the repo to `main`.
1 parent a30e98a commit cfe3c3f

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

.mergify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pull_request_rules:
22
- name: request changelog labels when a PR is missing them
33
conditions:
4-
- base=master
4+
- base=main
55
- -label=bug
66
- -label=enhancement
77
- -label=documentation
@@ -31,7 +31,7 @@ pull_request_rules:
3131
Once the correct labels have been set, simply remove the `needs changelog label` label from this PR so I can merge it.
3232
- name: merge PRs automatically
3333
conditions:
34-
- base=master
34+
- base=main
3535
- -label="needs changelog label"
3636
- -label=blocked
3737
- "#approved-reviews-by>=1"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
[![CircleCI](https://circleci.com/gh/solidusio/solidus_dev_support.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_dev_support)
5-
[![codecov](https://codecov.io/gh/solidusio/solidus_dev_support/branch/master/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_dev_support)
5+
[![codecov](https://codecov.io/gh/solidusio/solidus_dev_support/branch/main/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_dev_support)
66

77
This gem contains common development functionality for Solidus extensions.
88

@@ -192,7 +192,7 @@ The above command will:
192192

193193
* bump the gem version to the next minor (you can also use `patch`, `major` or a specific version
194194
number);
195-
* commit the change and push it to `origin/master`;
195+
* commit the change and push it to `origin/main`;
196196
* create a Git tag;
197197
* push the tag to the `origin` remote;
198198
* release the new version on RubyGems.

lib/solidus_dev_support/extension.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def default_gemspec
7979
gem.license = 'BSD-3-Clause'
8080

8181
gem.metadata['homepage_uri'] = gem.homepage = "https://github.com/#{repo}#readme"
82-
gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/master/CHANGELOG.md"
82+
gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/main/CHANGELOG.md"
8383
gem.metadata['source_code_uri'] = "https://github.com/#{repo}"
8484
end
8585
end

lib/solidus_dev_support/templates/extension/CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ follow so that we can have a chance of keeping on top of things.
1616
## Making Changes
1717

1818
* Create a topic branch from where you want to base your work.
19-
* This is usually the master branch.
19+
* This is usually the main branch.
2020
* Only target release branches if you are certain your fix must be on that
2121
branch.
22-
* To quickly create a topic branch based on master; `git branch
23-
fix/master/my_contribution master` then checkout the new branch with `git
24-
checkout fix/master/my_contribution`. Please avoid working directly on the
25-
`master` branch.
22+
* To quickly create a topic branch based on main; `git branch
23+
fix/main/my_contribution main` then checkout the new branch with `git
24+
checkout fix/main/my_contribution`. Please avoid working directly on the
25+
`main` branch.
2626
* Make commits of logical units.
2727
* Check for unnecessary whitespace with `git diff --check` before committing.
2828
* Make sure your commit messages are in the proper format.

lib/solidus_dev_support/templates/extension/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# <%= class_name.gsub(/(?<=[^A-Z])([A-Z])/, ' \1') %>
22

33
[![CircleCI](https://circleci.com/gh/<%= repo %>.svg?style=shield)](https://circleci.com/gh/<%= repo %>)
4-
[![codecov](https://codecov.io/gh/<%= repo %>/branch/master/graph/badge.svg)](https://codecov.io/gh/<%= repo %>)
4+
[![codecov](https://codecov.io/gh/<%= repo %>/branch/main/graph/badge.svg)](https://codecov.io/gh/<%= repo %>)
55

66
<!-- Explain what your extension does. -->
77

spec/lib/extension_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
expect(subject.gemspec.description).to eq('TODO: Write a longer description or delete this line.')
6262
expect(subject.gemspec.license).to eq('BSD-3-Clause')
6363
expect(subject.gemspec.homepage).to eq("https://github.com/solidusio-contrib/solidus_my_ext#readme")
64-
expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/master/CHANGELOG.md")
64+
expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/main/CHANGELOG.md")
6565
expect(subject.gemspec.metadata['source_code_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext")
6666
end
6767
end

0 commit comments

Comments
 (0)