From 241016430842bba9618828225a2a586d3cb96ab8 Mon Sep 17 00:00:00 2001 From: Neilson Carvalho Date: Tue, 18 Jan 2022 21:13:52 -0300 Subject: [PATCH] Update references from master to main (#1476) * Update references to `master` on documentation The master branch has been renamed to main, but the docs still reference it as master. * Update the changelog URI The changelog URI should be pointed to the main branch, where it is updated. The master branch is archived and has not been updated since version 5.0.0. * Update the main branch on Github Actions config Since shoulda-matchers 5.1.0, the main branch of the repository is `main`. --- .github/workflows/ci.yml | 2 +- CONTRIBUTING.md | 4 ++-- MAINTAINING.md | 4 ++-- shoulda-matchers.gemspec | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1b4d8a3..0ce5d9ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: Test on: push: branches: - - master + - main paths-ignore: - '**.md' pull_request: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 578d5788..a40369de 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ contributions in a timely manner. Once we look at your pull request, we may give you feedback. For instance, we may suggest some changes to make to your code to fit within the project style or discuss alternate ways of addressing the issue in question. Assuming we're happy with everything, we'll then bring your changes -into master. Now you're a contributor! +into main. Now you're a contributor! --- @@ -171,7 +171,7 @@ bundle exec rake guide] was a wonderful piece on this topic when it came out and we still find it to be helpful even today. * Squash "WIP" commits and remove merge commits by rebasing your branch against - `master`. We try to keep our commit history as clean as possible. + `main`. We try to keep our commit history as clean as possible. [Tim Pope's guide]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html diff --git a/MAINTAINING.md b/MAINTAINING.md index 564cc01c..eddc2fdb 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -48,7 +48,7 @@ patrons happy. We do this by: ## Workflow -We generally follow [GitHub Flow]. The `master` branch is the main line, and all +We generally follow [GitHub Flow]. The `main` branch is the main line, and all branches are cut from and get merged back into this branch. Generally, the workflow is as follows: @@ -154,7 +154,7 @@ That's it! ## Updating the changelog -After every user-facing change makes it into master, we make a note of it in the +After every user-facing change makes it into main, we make a note of it in the changelog, kept in `CHANGELOG.md`. The changelog is sorted in reverse order by release version, with the topmost version as the next release (tagged as "(Unreleased)"). diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec index f7b73b80..0a61bff3 100644 --- a/shoulda-matchers.gemspec +++ b/shoulda-matchers.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.metadata = { 'bug_tracker_uri' => 'https://github.com/thoughtbot/shoulda-matchers/issues', - 'changelog_uri' => 'https://github.com/thoughtbot/shoulda-matchers/blob/master/CHANGELOG.md', + 'changelog_uri' => 'https://github.com/thoughtbot/shoulda-matchers/blob/main/CHANGELOG.md', 'documentation_uri' => 'https://matchers.shoulda.io/docs', 'homepage_uri' => 'https://matchers.shoulda.io', 'source_code_uri' => 'https://github.com/thoughtbot/shoulda-matchers',