Skip to content

Commit 86e77f7

Browse files
authored
Merge pull request #433 from meilisearch/remove-bors
Remove bors and use GitHub merge queue
2 parents 16e4d4b + 7ebeda9 commit 86e77f7

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

.github/release-draft-template.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,5 @@ template: |
2828
no-changes-template: 'Changes are coming soon 😎'
2929
sort-direction: 'ascending'
3030
replacers:
31-
- search: '/(?:and )?@bors(?:\[bot\])?,?/g'
32-
replace: ''
3331
- search: '/(?:and )?@meili-bot,?/g'
3432
replace: ''
35-
- search: '/(?:and )?@meili-bors[bot],?/g'
36-
replace: ''

.github/workflows/tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ name: Tests
33
on:
44
pull_request:
55
push:
6-
# trying and staging branches are for Bors config
76
branches:
8-
- trying
9-
- staging
107
- main
8+
merge_group:
119

1210
jobs:
1311
integration-tests:

CONTRIBUTING.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,13 @@ Some notes on GitHub PRs:
128128

129129
- [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>
130130
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
131-
- 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/resources/bors.md) to automatically enforce this requirement without the PR author having to do it manually.
132131
- All PRs must be reviewed and approved by at least one maintainer.
133132
- 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-rails/releases/).
134133

135134
## Release Process (for the internal team only)
136135

137136
Meilisearch tools follow the [Semantic Versioning Convention](https://semver.org/).
138137

139-
### Automation to Rebase and Merge the PRs <!-- omit in toc -->
140-
141-
This project integrates a bot that helps us manage pull requests merging.<br>
142-
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
143-
144138
### Automated Changelogs <!-- omit in toc -->
145139

146140
This project integrates a tool to create automated changelogs.<br>

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<img src="https://codecov.io/gh/meilisearch/meilisearch-rails/branch/main/graph/badge.svg?token=9J7LRP11IR"/>
2121
</a>
2222
<a href="https://github.com/meilisearch/meilisearch-rails/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
23-
<a href="https://ms-bors.herokuapp.com/repositories/68"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
2423
</p>
2524

2625
<p align="center">⚡ The Meilisearch integration for Ruby on Rails 💎</p>
@@ -113,7 +112,7 @@ bin/rails meilisearch:install
113112

114113
The gem is compatible with [ActiveRecord](https://github.com/rails/rails/tree/master/activerecord), [Mongoid](https://github.com/mongoid/mongoid) and [Sequel](https://github.com/jeremyevans/sequel).
115114

116-
⚠️ Note that even if you want to use all the default options, you must declare an empty `meilisearch` block in your model.
115+
⚠️ Note that even if you want to use all the default options, you must declare an empty `meilisearch` block in your model.
117116

118117
#### Add documents <!-- omit in toc -->
119118

@@ -348,7 +347,7 @@ An enumerable `FederatedSearchResult` is returned, which can be iterated through
348347
349348
350349
<ul>
351-
<!-- Attack on Titan appears first even though it was specified second,
350+
<!-- Attack on Titan appears first even though it was specified second,
352351
it's ranked higher because it's a closer match -->
353352
<li>Attack on Titan</li>
354353
<li>Harry Potter and the Philosopher's Stone</li>
@@ -387,7 +386,7 @@ results = Meilisearch::Rails.federated_search(
387386

388387
### Loading records <!-- omit in toc -->
389388

390-
Records are loaded when the `:scope` option is passed (may be a model or a relation),
389+
Records are loaded when the `:scope` option is passed (may be a model or a relation),
391390
or when a hash query is used with models as keys:
392391

393392
```ruby
@@ -601,7 +600,7 @@ Meilisearch::Rails.deactivate! # all the following HTTP calls will be dismissed.
601600
602601
Meilisearch::Rails.deactivate! do
603602
# every Meilisearch call here will be dismissed, no error will be raised.
604-
# after the block, Meilisearch state will be active.
603+
# after the block, Meilisearch state will be active.
605604
end
606605
```
607606

@@ -687,7 +686,7 @@ class Book < ActiveRecord::Base
687686
end
688687
```
689688

690-
You can also set the `primary_key` as a method, this method will be evaluated in runtime, and its return
689+
You can also set the `primary_key` as a method, this method will be evaluated in runtime, and its return
691690
will be used as the reference to the document when Meilisearch needs it.
692691

693692
```rb

0 commit comments

Comments
 (0)