IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Pin hashie and faraday versions for zendesk api compatibility (#9214)

Browse Source
This commit is contained in:
David Taylor
2020-03-19 19:52:31 +00:00
committed by GitHub
parent f3ddc36ac6
commit e9a3639b10
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Gemfile
View File

@@ -255,3 +255,10 @@ end
gem 'webpush', require: false gem 'webpush', require: false
gem 'colored2', require: false gem 'colored2', require: false
gem 'maxminddb' 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

2
Gemfile.lock
View File

@@ -456,12 +456,14 @@ DEPENDENCIES
execjs execjs
fabrication fabrication
fakeweb fakeweb
faraday (< 1.0.0)
fast_blank fast_blank
fast_xor fast_xor
fast_xs fast_xs
fastimage fastimage
flamegraph flamegraph
gc_tracer gc_tracer
hashie (< 4.0.0)
highline (~> 1.7.0) highline (~> 1.7.0)
htmlentities htmlentities
http_accept_language http_accept_language