From 5393b187c4601966f9be23490dfb1e54f3f3e725 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sat, 29 Feb 2020 03:05:02 +0100
Subject: [PATCH] Fix elasticsearch-api and faraday incompatibilities (#13166)
---
Gemfile.lock | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 7289e14450..59ab2ba7cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -202,14 +202,14 @@ GEM
dotenv (= 2.7.5)
railties (>= 3.2, < 6.1)
e2mmap (0.1.0)
- elasticsearch (7.3.0)
- elasticsearch-api (= 7.3.0)
- elasticsearch-transport (= 7.3.0)
- elasticsearch-api (7.3.0)
+ elasticsearch (7.5.0)
+ elasticsearch-api (= 7.5.0)
+ elasticsearch-transport (= 7.5.0)
+ elasticsearch-api (7.5.0)
multi_json
elasticsearch-dsl (0.1.8)
- elasticsearch-transport (7.3.0)
- faraday
+ elasticsearch-transport (7.5.0)
+ faraday (>= 0.14, < 1)
multi_json
encryptor (3.0.0)
equatable (0.6.1)
@@ -220,7 +220,7 @@ GEM
fabrication (2.21.0)
faker (2.10.1)
i18n (>= 1.6, < 2)
- faraday (1.0.0)
+ faraday (0.17.3)
multipart-post (>= 1.2, < 3)
fast_blank (1.0.0)
fastimage (2.1.7)
--
GitLab