diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml
index 0a7dc42..da0a75c 100644
--- a/.github/release-draft-template.yml
+++ b/.github/release-draft-template.yml
@@ -28,9 +28,5 @@ template: |
no-changes-template: 'Changes are coming soon 😎'
sort-direction: 'ascending'
replacers:
- - search: '/(?:and )?@bors(?:\[bot\])?,?/g'
- replace: ''
- search: '/(?:and )?@meili-bot,?/g'
replace: ''
- - search: '/(?:and )?@meili-bors[bot],?/g'
- replace: ''
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 619ba72..ea953eb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,11 +3,9 @@ name: Tests
on:
pull_request:
push:
- # trying and staging branches are for Bors config
branches:
- - trying
- - staging
- main
+ merge_group:
jobs:
integration-tests:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c149c9c..12a0ecc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -128,7 +128,6 @@ Some notes on GitHub PRs:
- [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.
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
-- 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.
- All PRs must be reviewed and approved by at least one maintainer.
- 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/).
@@ -136,11 +135,6 @@ Some notes on GitHub PRs:
Meilisearch tools follow the [Semantic Versioning Convention](https://semver.org/).
-### Automation to Rebase and Merge the PRs
-
-This project integrates a bot that helps us manage pull requests merging.
-_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
-
### Automated Changelogs
This project integrates a tool to create automated changelogs.
diff --git a/README.md b/README.md
index e5a3fdb..3386731 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@
-
⚡ The Meilisearch integration for Ruby on Rails 💎
@@ -113,7 +112,7 @@ bin/rails meilisearch:install 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). -⚠️ Note that even if you want to use all the default options, you must declare an empty `meilisearch` block in your model. +⚠️ Note that even if you want to use all the default options, you must declare an empty `meilisearch` block in your model. #### Add documents @@ -348,7 +347,7 @@ An enumerable `FederatedSearchResult` is returned, which can be iterated through