diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-11-19 19:55:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-19 19:55:02 +0100 |
commit | 3ba7c85ec9bd5dcf75b30b00ed634b3b31a029af (patch) | |
tree | 6e0cd84a36280b314df2e1654e42f3dc05ee56e1 /config/initializers/chewy.rb | |
parent | f2b376e9d82577dc630757a2b927d02f8bfcf4b0 (diff) | |
parent | 189cf652e6b3c6ee1d303282ca93823965f89f24 (diff) |
Merge pull request #1634 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers/chewy.rb')
-rw-r--r-- | config/initializers/chewy.rb | 20 |
1 files changed, 0 insertions, 20 deletions
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 -} |