Skip to content

Commit f817533

Browse files
bors[bot]meili-bot
andauthored
Merge #149
149: Replace master into main r=curquiza a=meili-bot _This PR is auto-generated._ Following the renaming of the main branch (`master` -> `main`). Co-authored-by: meili-bot <[email protected]>
2 parents 2ac50b8 + 1d48679 commit f817533

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ First of all, thank you for contributing to MeiliSearch! The goal of this docume
2525
3. [Create a new Git branch](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository).
2626
4. Review the [Development Workflow](#workflow) section that describes the steps to maintain the repository.
2727
5. Make the changes on your branch.
28-
6. [Submit the branch as a PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) pointing to the `master` branch of the main meilisearch-ruby repository. A maintainer should comment and/or review your Pull Request within a few days. Although depending on the circumstances, it may take longer.<br>
28+
6. [Submit the branch as a PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) pointing to the `main` branch of the main meilisearch-ruby repository. A maintainer should comment and/or review your Pull Request within a few days. Although depending on the circumstances, it may take longer.<br>
2929
We do not enforce a naming convention for the PRs, but **please use something descriptive of your changes**, having in mind that the title of your PR will be automatically added to the next [release changelog](https://github.com/meilisearch/meilisearch-ruby/releases/).
3030

3131
## Development Workflow
@@ -120,7 +120,7 @@ Some notes on GitHub PRs:
120120

121121
- [Convert your PR as a draft](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request) if your changes are a work in progress: no one will review it until you pass your PR as ready for review.<br>
122122
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
123-
- The branch related to the PR must be **up-to-date with `master`** before merging. Fortunately, this project [integrates a bot](https://github.com/meilisearch/integration-guides/blob/master/guides/bors.md) to automatically enforce this requirement without the PR author having to do it manually..
123+
- The branch related to the PR must be **up-to-date with `main`** before merging. Fortunately, this project [integrates a bot](https://github.com/meilisearch/integration-guides/blob/main/guides/bors.md) to automatically enforce this requirement without the PR author having to do it manually..
124124
- All PRs must be reviewed and approved by at least one maintainer.
125125
- The PR title should be accurate and descriptive of the changes. The title of the PR will be indeed automatically added to the next [release changelogs](https://github.com/meilisearch/meilisearch-ruby/releases/).
126126

@@ -131,24 +131,24 @@ MeiliSearch tools follow the [Semantic Versioning Convention](https://semver.org
131131
### Automation to Rebase and Merge the PRs
132132

133133
This project integrates a bot that helps us manage pull requests merging.<br>
134-
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/master/guides/bors.md)._
134+
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/guides/bors.md)._
135135

136136
### Automated Changelogs
137137

138138
This project integrates a tool to create automated changelogs.<br>
139-
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/master/guides/release-drafter.md)._
139+
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/guides/release-drafter.md)._
140140

141141
### How to Publish the Release
142142

143-
⚠️ Before doing anything, make sure you got through the guide about [Releasing an Integration Tool](https://github.com/meilisearch/integration-guides/blob/master/guides/integration-tool-release.md).
143+
⚠️ Before doing anything, make sure you got through the guide about [Releasing an Integration Tool](https://github.com/meilisearch/integration-guides/blob/main/guides/integration-tool-release.md).
144144

145145
Make a PR modifying the file [`lib/meilisearch/version.rb`](/lib/meilisearch/version.rb) with the right version.
146146

147147
```ruby
148148
VERSION = 'X.X.X'
149149
```
150150

151-
Once the changes are merged on `master`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/meilisearch-ruby/releases).
151+
Once the changes are merged on `main`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/meilisearch-ruby/releases).
152152

153153
GitHub Actions will be triggered and push the package to [RubyGems](https://rubygems.org/gems/meilisearch).
154154

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<p align="center">
1717
<a href="https://badge.fury.io/rb/meilisearch"><img src="https://badge.fury.io/rb/meilisearch.svg" alt="Latest Stable Version"></a>
1818
<a href="https://github.com/meilisearch/meilisearch-ruby/actions"><img src="https://github.com/meilisearch/meilisearch-ruby/workflows/Tests/badge.svg" alt="Test"></a>
19-
<a href="https://github.com/meilisearch/meilisearch-ruby/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
19+
<a href="https://github.com/meilisearch/meilisearch-ruby/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
2020
<a href="https://app.bors.tech/repositories/28781"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
2121
</p>
2222

0 commit comments

Comments
 (0)