Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pull_request_rules:
- name: request changelog labels when a PR is missing them
conditions:
- base=master
- base=main
- -label=bug
- -label=enhancement
- -label=documentation
Expand Down Expand Up @@ -31,7 +31,7 @@ pull_request_rules:
Once the correct labels have been set, simply remove the `needs changelog label` label from this PR so I can merge it.
- name: merge PRs automatically
conditions:
- base=master
- base=main
- -label="needs changelog label"
- -label=blocked
- "#approved-reviews-by>=1"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


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

This gem contains common development functionality for Solidus extensions.

Expand Down Expand Up @@ -192,7 +192,7 @@ The above command will:

* bump the gem version to the next minor (you can also use `patch`, `major` or a specific version
number);
* commit the change and push it to `origin/master`;
* commit the change and push it to `origin/main`;
* create a Git tag;
* push the tag to the `origin` remote;
* release the new version on RubyGems.
Expand Down
2 changes: 1 addition & 1 deletion lib/solidus_dev_support/extension.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def default_gemspec
gem.license = 'BSD-3-Clause'

gem.metadata['homepage_uri'] = gem.homepage = "https://github.com/#{repo}#readme"
gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/master/CHANGELOG.md"
gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/main/CHANGELOG.md"
gem.metadata['source_code_uri'] = "https://github.com/#{repo}"
end
end
Expand Down
10 changes: 5 additions & 5 deletions lib/solidus_dev_support/templates/extension/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ follow so that we can have a chance of keeping on top of things.
## Making Changes

* Create a topic branch from where you want to base your work.
* This is usually the master branch.
* This is usually the main branch.
* Only target release branches if you are certain your fix must be on that
branch.
* To quickly create a topic branch based on master; `git branch
fix/master/my_contribution master` then checkout the new branch with `git
checkout fix/master/my_contribution`. Please avoid working directly on the
`master` branch.
* To quickly create a topic branch based on main; `git branch
fix/main/my_contribution main` then checkout the new branch with `git
checkout fix/main/my_contribution`. Please avoid working directly on the
`main` branch.
* Make commits of logical units.
* Check for unnecessary whitespace with `git diff --check` before committing.
* Make sure your commit messages are in the proper format.
Expand Down
2 changes: 1 addition & 1 deletion lib/solidus_dev_support/templates/extension/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# <%= class_name.gsub(/(?<=[^A-Z])([A-Z])/, ' \1') %>

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

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

Expand Down
2 changes: 1 addition & 1 deletion spec/lib/extension_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
expect(subject.gemspec.description).to eq('TODO: Write a longer description or delete this line.')
expect(subject.gemspec.license).to eq('BSD-3-Clause')
expect(subject.gemspec.homepage).to eq("https://github.com/solidusio-contrib/solidus_my_ext#readme")
expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/master/CHANGELOG.md")
expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/main/CHANGELOG.md")
expect(subject.gemspec.metadata['source_code_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext")
end
end
Expand Down