From e9a3639b107393cb581a484dc89a2b0151623aca Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 19 Mar 2020 19:52:31 +0000
Subject: [PATCH] DEV: Pin hashie and faraday versions for zendesk api
 compatibility (#9214)

---
 Gemfile      | 7 +++++++
 Gemfile.lock | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/Gemfile b/Gemfile
index 73f97c05334..a1f8015d13b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -255,3 +255,10 @@ end
 gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
+
+# These are not direct dependencies, but we need to restrict
+# versions for compatibility with https://github.com/discourse/discourse-zendesk-plugin
+# These restrictions can be removed once the zendesk_api gem is updated
+# for newer versions of hashie and faraday
+gem 'hashie', '< 4.0.0', require: false # https://github.com/zendesk/zendesk_api_client_rb/pull/422
+gem 'faraday', '< 1.0.0', require: false # https://github.com/zendesk/zendesk_api_client_rb/pull/421
diff --git a/Gemfile.lock b/Gemfile.lock
index 1280352e63e..9c253f83084 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -456,12 +456,14 @@ DEPENDENCIES
   execjs
   fabrication
   fakeweb
+  faraday (< 1.0.0)
   fast_blank
   fast_xor
   fast_xs
   fastimage
   flamegraph
   gc_tracer
+  hashie (< 4.0.0)
   highline (~> 1.7.0)
   htmlentities
   http_accept_language