Commit c951f1792549b1bda2b3bf90145c9a48540aeb58
1 parent
de0a7a0a
Exists in
master
and in
5 other branches
Fixed CI
Showing
5 changed files
with
5 additions
and
5 deletions
Show diff stats
README.md
| @@ -392,7 +392,7 @@ search_synonyms: "synonyms.txt" | @@ -392,7 +392,7 @@ search_synonyms: "synonyms.txt" | ||
| 392 | Add [elasticsearch-xpack](https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-xpack) to your Gemfile: | 392 | Add [elasticsearch-xpack](https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-xpack) to your Gemfile: |
| 393 | 393 | ||
| 394 | ```ruby | 394 | ```ruby |
| 395 | -gem 'elasticsearch-xpack', '>= 7.8.0' | 395 | +gem 'elasticsearch-xpack', '>= 7.8', '< 7.14' |
| 396 | ``` | 396 | ``` |
| 397 | 397 | ||
| 398 | And use: | 398 | And use: |
gemfiles/activerecord52.gemfile
| @@ -9,7 +9,7 @@ gem "activerecord", "~> 5.2.0" | @@ -9,7 +9,7 @@ gem "activerecord", "~> 5.2.0" | ||
| 9 | gem "actionpack", "~> 5.2.0" | 9 | gem "actionpack", "~> 5.2.0" |
| 10 | gem "activejob", "~> 5.2.0", require: "active_job" | 10 | gem "activejob", "~> 5.2.0", require: "active_job" |
| 11 | gem "elasticsearch", "~> 7" | 11 | gem "elasticsearch", "~> 7" |
| 12 | -gem "elasticsearch-xpack", "~> 7" | 12 | +gem "elasticsearch-xpack", ">= 7.8", "< 7.14" |
| 13 | gem "redis" | 13 | gem "redis" |
| 14 | gem "connection_pool" | 14 | gem "connection_pool" |
| 15 | gem "kaminari" | 15 | gem "kaminari" |
gemfiles/activerecord60.gemfile
| @@ -9,7 +9,7 @@ gem "activerecord", "~> 6.0.0" | @@ -9,7 +9,7 @@ gem "activerecord", "~> 6.0.0" | ||
| 9 | gem "actionpack", "~> 6.0.0" | 9 | gem "actionpack", "~> 6.0.0" |
| 10 | gem "activejob", "~> 6.0.0", require: "active_job" | 10 | gem "activejob", "~> 6.0.0", require: "active_job" |
| 11 | gem "elasticsearch", "~> 7" | 11 | gem "elasticsearch", "~> 7" |
| 12 | -gem "elasticsearch-xpack", "~> 7" | 12 | +gem "elasticsearch-xpack", ">= 7.8", "< 7.14" |
| 13 | gem "redis" | 13 | gem "redis" |
| 14 | gem "connection_pool" | 14 | gem "connection_pool" |
| 15 | gem "kaminari" | 15 | gem "kaminari" |
gemfiles/mongoid6.gemfile
| @@ -8,7 +8,7 @@ gem "mongoid", "~> 6.0.0" | @@ -8,7 +8,7 @@ gem "mongoid", "~> 6.0.0" | ||
| 8 | gem "activejob", require: "active_job" | 8 | gem "activejob", require: "active_job" |
| 9 | gem "redis" | 9 | gem "redis" |
| 10 | gem "elasticsearch", "~> 7" | 10 | gem "elasticsearch", "~> 7" |
| 11 | -gem "elasticsearch-xpack", ">= 7.8.0" | 11 | +gem "elasticsearch-xpack", ">= 7.8", "< 7.14" |
| 12 | gem "actionpack" | 12 | gem "actionpack" |
| 13 | gem "kaminari" | 13 | gem "kaminari" |
| 14 | gem "gemoji-parser" | 14 | gem "gemoji-parser" |
gemfiles/mongoid7.gemfile
| @@ -8,7 +8,7 @@ gem "mongoid", "~> 7.0.0" | @@ -8,7 +8,7 @@ gem "mongoid", "~> 7.0.0" | ||
| 8 | gem "activejob", require: "active_job" | 8 | gem "activejob", require: "active_job" |
| 9 | gem "redis" | 9 | gem "redis" |
| 10 | gem "elasticsearch", "~> 7" | 10 | gem "elasticsearch", "~> 7" |
| 11 | -gem "elasticsearch-xpack", ">= 7.8.0" | 11 | +gem "elasticsearch-xpack", ">= 7.8", "< 7.14" |
| 12 | gem "actionpack" | 12 | gem "actionpack" |
| 13 | gem "kaminari" | 13 | gem "kaminari" |
| 14 | gem "gemoji-parser" | 14 | gem "gemoji-parser" |