erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Use chewy which relaxes ES version reqs (#30157)

Browse source
This commit is contained in:
Matt Jankowski 2024-05-06 07:50:45 -04:00 committed by GitHub
parent e5062b7135
commit dbaa4ed891
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Gemfile.lock
View file

@ -167,9 +167,9 @@ GEM
activesupport activesupport
cbor (0.5.9.8) cbor (0.5.9.8)
charlock_holmes (0.7.7) charlock_holmes (0.7.7)
chewy (7.5.1) chewy (7.6.0)
activesupport (>= 5.2) activesupport (>= 5.2)
elasticsearch (>= 7.12.0, < 7.14.0) elasticsearch (>= 7.14.0, < 8)
elasticsearch-dsl elasticsearch-dsl
chunky_png (1.4.0) chunky_png (1.4.0)
climate_control (1.2.0) climate_control (1.2.0)
@ -220,14 +220,14 @@ GEM
dotenv (3.1.1) dotenv (3.1.1)
drb (2.2.1) drb (2.2.1)
ed25519 (1.3.0) ed25519 (1.3.0)
elasticsearch (7.13.3) elasticsearch (7.17.10)
elasticsearch-api (= 7.13.3) elasticsearch-api (= 7.17.10)
elasticsearch-transport (= 7.13.3) elasticsearch-transport (= 7.17.10)
elasticsearch-api (7.13.3) elasticsearch-api (7.17.10)
multi_json multi_json
elasticsearch-dsl (0.1.10) elasticsearch-dsl (0.1.10)
elasticsearch-transport (7.13.3) elasticsearch-transport (7.17.10)
faraday (~> 1) faraday (>= 1, < 3)
multi_json multi_json
email_spec (2.2.2) email_spec (2.2.2)
htmlentities (~> 4.3.3) htmlentities (~> 4.3.3)

2
spec/lib/admin/system_check/elasticsearch_check_spec.rb
View file

@ -127,7 +127,7 @@ describe Admin::SystemCheck::ElasticsearchCheck do
end end
def stub_elasticsearch_error def stub_elasticsearch_error
client = instance_double(Elasticsearch::Transport::Client) client = instance_double(Elasticsearch::Client)
allow(client).to receive(:info).and_raise(Elasticsearch::Transport::Transport::Error) allow(client).to receive(:info).and_raise(Elasticsearch::Transport::Transport::Error)
allow(Chewy).to receive(:client).and_return(client) allow(Chewy).to receive(:client).and_return(client)
end end