cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix elasticsearch-api and faraday incompatibilities (#13166)

This commit is contained in:
ThibG 2020-02-29 03:05:02 +01:00 committed by GitHub
parent ce17cea221
commit 5393b187c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Gemfile.lock
View File

@ -202,14 +202,14 @@ GEM
dotenv (= 2.7.5) dotenv (= 2.7.5)
railties (>= 3.2, < 6.1) railties (>= 3.2, < 6.1)
e2mmap (0.1.0) e2mmap (0.1.0)
elasticsearch (7.3.0) elasticsearch (7.5.0)
elasticsearch-api (= 7.3.0) elasticsearch-api (= 7.5.0)
elasticsearch-transport (= 7.3.0) elasticsearch-transport (= 7.5.0)
elasticsearch-api (7.3.0) elasticsearch-api (7.5.0)
multi_json multi_json
elasticsearch-dsl (0.1.8) elasticsearch-dsl (0.1.8)
elasticsearch-transport (7.3.0) elasticsearch-transport (7.5.0)
faraday faraday (>= 0.14, < 1)
multi_json multi_json
encryptor (3.0.0) encryptor (3.0.0)
equatable (0.6.1) equatable (0.6.1)
@ -220,7 +220,7 @@ GEM
fabrication (2.21.0) fabrication (2.21.0)
faker (2.10.1) faker (2.10.1)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
faraday (1.0.0) faraday (0.17.3)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
fast_blank (1.0.0) fast_blank (1.0.0)
fastimage (2.1.7) fastimage (2.1.7)