From b18bc2a97e3ef504702b12de339a75651ed0b5ea Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 13 May 2020 12:15:29 +0200
Subject: [PATCH] Downgraded faraday from 1.0 to 0.17 for better compatibility
 with elasticsearch-ruby 5 (#205 #196)

---
 CHANGELOG.md | 1 +
 Gemfile      | 1 +
 Gemfile.lock | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b1fabfd5..4be00df17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog Fab-manager
 
 - Prevent admins from leaving their dedicated group
+- Downgraded faraday from 1.0 to 0.17 for better compatibility with elasticsearch-ruby 5 (#205 #196)
 - Fix a bug: when an admin logs on the subscription page, his view is broken
 - Fix a bug: admin's members list shows the same members multiple times
 
diff --git a/Gemfile b/Gemfile
index dfe35d9bd..4526e6a3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -115,6 +115,7 @@ gem 'prawn-table'
 gem 'elasticsearch-model', '~> 5'
 gem 'elasticsearch-persistence', '~> 5'
 gem 'elasticsearch-rails', '~> 5'
+gem 'faraday', '~> 0.17'
 
 gem 'notify_with'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5513821f6..3f7b54744 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,7 +165,7 @@ GEM
     execjs (2.7.0)
     faker (2.10.2)
       i18n (>= 1.6, < 2)
-    faraday (1.0.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     ffi (1.12.2)
     font-awesome-rails (4.7.0.5)
@@ -484,6 +484,7 @@ DEPENDENCIES
   elasticsearch-persistence (~> 5)
   elasticsearch-rails (~> 5)
   faker
+  faraday (~> 0.17)
   font-awesome-rails
   foreman
   forgery