Commit de0a7a0a847cf658b57638af94496f037d34e288
1 parent
ee1b8424
Exists in
master
and in
5 other branches
Fixed UnsupportedProductError - fixes #1509
Showing
4 changed files
with
2 additions
and
9 deletions
Show diff stats
Gemfile
| @@ -13,5 +13,5 @@ gem "typhoeus" | @@ -13,5 +13,5 @@ gem "typhoeus" | ||
| 13 | gem "redis" | 13 | gem "redis" |
| 14 | gem "connection_pool" | 14 | gem "connection_pool" |
| 15 | gem "kaminari" | 15 | gem "kaminari" |
| 16 | -gem "elasticsearch-xpack", ">= 7.8.0" | 16 | +gem "elasticsearch-xpack", ">= 7.8", "< 7.14" |
| 17 | gem "parallel_tests" | 17 | gem "parallel_tests" |
README.md
| @@ -58,12 +58,6 @@ Add this line to your application’s Gemfile: | @@ -58,12 +58,6 @@ Add this line to your application’s Gemfile: | ||
| 58 | gem 'searchkick' | 58 | gem 'searchkick' |
| 59 | ``` | 59 | ``` |
| 60 | 60 | ||
| 61 | -For OpenSearch, also add: | ||
| 62 | - | ||
| 63 | -```ruby | ||
| 64 | -gem 'elasticsearch', '< 7.14' | ||
| 65 | -``` | ||
| 66 | - | ||
| 67 | The latest version works with Elasticsearch 6 and 7 and OpenSearch 1. For Elasticsearch 5, use version 3.1.3 and [this readme](https://github.com/ankane/searchkick/blob/v3.1.3/README.md). | 61 | The latest version works with Elasticsearch 6 and 7 and OpenSearch 1. For Elasticsearch 5, use version 3.1.3 and [this readme](https://github.com/ankane/searchkick/blob/v3.1.3/README.md). |
| 68 | 62 | ||
| 69 | Add searchkick to models you want to search. | 63 | Add searchkick to models you want to search. |
gemfiles/opensearch.gemfile
| @@ -13,6 +13,5 @@ gem "typhoeus" | @@ -13,6 +13,5 @@ gem "typhoeus" | ||
| 13 | gem "redis" | 13 | gem "redis" |
| 14 | gem "connection_pool" | 14 | gem "connection_pool" |
| 15 | gem "kaminari" | 15 | gem "kaminari" |
| 16 | -gem "elasticsearch", "< 7.14" | ||
| 17 | gem "elasticsearch-xpack", ">= 7.8", "< 7.14" | 16 | gem "elasticsearch-xpack", ">= 7.8", "< 7.14" |
| 18 | gem "parallel_tests" | 17 | gem "parallel_tests" |
searchkick.gemspec
| @@ -16,6 +16,6 @@ Gem::Specification.new do |spec| | @@ -16,6 +16,6 @@ Gem::Specification.new do |spec| | ||
| 16 | spec.required_ruby_version = ">= 2.4" | 16 | spec.required_ruby_version = ">= 2.4" |
| 17 | 17 | ||
| 18 | spec.add_dependency "activemodel", ">= 5" | 18 | spec.add_dependency "activemodel", ">= 5" |
| 19 | - spec.add_dependency "elasticsearch", ">= 6" | 19 | + spec.add_dependency "elasticsearch", ">= 6", "< 7.14" |
| 20 | spec.add_dependency "hashie" | 20 | spec.add_dependency "hashie" |
| 21 | end | 21 | end |