github / searchkick

Download as
Browse Code »

Commit b092101f34bea9fed8db1bd36c44479515c61a89

Authored by Andrew
1 parent b715e9e3
Exists in master and in 19 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, highlighted, index_name, lazy_index_name, less_deps, nested, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, wildcard

Updated docs and dependencies [skip ci]

Showing 3 changed files with 6 additions and 11 deletions   Show diff stats
CHANGELOG.md
  Diff comments   View file @b092101
1 1 ## 3.0.0 [unreleased]
2 2  
3 3 - Removed support for Elasticsearch 2
  4 +- Removed support for ActiveRecord < 4.2
4 5 - Removed `reindex_async` method. `reindex` now defaults to mode specified by model. Use `reindex(mode: :async)` to force async reindex.
5 6  
6 7 ## 2.5.1 [unreleased]
... ...
README.md
  Diff comments   View file @b092101
... ... @@ -54,7 +54,7 @@ Add this line to your application’s Gemfile:
54 54 gem 'searchkick'
55 55 ```
56 56  
57   -The latest version works with Elasticsearch 2, 5, and 6. For Elasticsearch 1, use version 1.5.1 and [this readme](https://github.com/ankane/searchkick/blob/v1.5.1/README.md).
  57 +The latest version works with Elasticsearch 5 and 6. For Elasticsearch 2, use version 2.5.0 and [this readme](https://github.com/ankane/searchkick/blob/v2.5.0/README.md).
58 58  
59 59 Add searchkick to models you want to search.
60 60  
... ... @@ -1093,12 +1093,6 @@ heroku run rake searchkick:reindex CLASS=Product
1093 1093  
1094 1094 ### Amazon Elasticsearch Service
1095 1095  
1096   -Include `elasticsearch 1.0.15` or greater in your Gemfile.
1097   -
1098   -```ruby
1099   -gem 'elasticsearch', '>= 1.0.15'
1100   -```
1101   -
1102 1096 Create an initializer `config/initializers/elasticsearch.rb` with:
1103 1097  
1104 1098 ```ruby
... ... @@ -1108,7 +1102,7 @@ ENV[&quot;ELASTICSEARCH_URL&quot;] = &quot;https://es-domain-1234.us-east-1.es.amazonaws.com&quot;
1108 1102 To use signed request, include in your Gemfile:
1109 1103  
1110 1104 ```ruby
1111   -gem 'faraday_middleware-aws-signers-v4', '>= 0.1.9'
  1105 +gem 'faraday_middleware-aws-sigv4'
1112 1106 ```
1113 1107  
1114 1108 and add to your initializer:
... ...
searchkick.gemspec
  Diff comments   View file @b092101
... ... @@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
18 18 spec.test_files = spec.files.grep(%r{^(test|spec|features|benchmark)/})
19 19 spec.require_paths = ["lib"]
20 20  
21   - spec.add_dependency "activemodel", ">= 4.1"
22   - spec.add_dependency "elasticsearch", ">= 1"
  21 + spec.add_dependency "activemodel", ">= 4.2"
  22 + spec.add_dependency "elasticsearch", ">= 5"
23 23 spec.add_dependency "hashie"
24 24  
25 25 spec.add_development_dependency "bundler"
26   - spec.add_development_dependency "rake"
27 26 spec.add_development_dependency "minitest"
  27 + spec.add_development_dependency "rake"
28 28 end
... ...