From 3419d3ec84c3aa4f450265642e0a85dcdd3c36d0 Mon Sep 17 00:00:00 2001 From: Takeshi Umeda Date: Fri, 19 Nov 2021 06:02:08 +0900 Subject: Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915) * Bump chewy from 5.2.0 to 7.2.2 * fix style (codeclimate) * fix style * fix style * Bump chewy from 7.2.2 to 7.2.3 --- config/initializers/chewy.rb | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'config/initializers') diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb index 820182a21..fbbcbbcde 100644 --- a/config/initializers/chewy.rb +++ b/config/initializers/chewy.rb @@ -37,23 +37,3 @@ end # Mastodon is run with hidden services enabled, because # ElasticSearch is *not* supposed to be accessed through a proxy Faraday.ignore_env_proxy = true - -# Elasticsearch 7.x workaround -Elasticsearch::Transport::Client.prepend Module.new { - def search(arguments = {}) - arguments[:rest_total_hits_as_int] = true - super arguments - end -} - -Elasticsearch::API::Indices::IndicesClient.prepend Module.new { - def create(arguments = {}) - arguments[:include_type_name] = true - super arguments - end - - def put_mapping(arguments = {}) - arguments[:include_type_name] = true - super arguments - end -} -- cgit