DEV: Bump Hashie and Faraday (#9583)

These were previously pinned due to a dependency in the zendesk plugin. That has now been resolved.
This commit is contained in:
David Taylor 2020-04-29 12:55:30 +01:00 committed by GitHub
parent 4eed86919e
commit 6a9a7b56df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions

View File

@ -257,10 +257,3 @@ 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

View File

@ -126,7 +126,7 @@ GEM
exifr (1.3.6) exifr (1.3.6)
fabrication (2.21.1) fabrication (2.21.1)
fakeweb (1.3.0) fakeweb (1.3.0)
faraday (0.17.3) faraday (1.0.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
fast_blank (1.0.0) fast_blank (1.0.0)
fast_xor (1.1.3) fast_xor (1.1.3)
@ -142,7 +142,7 @@ GEM
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
guess_html_encoding (0.0.11) guess_html_encoding (0.0.11)
hashdiff (1.0.1) hashdiff (1.0.1)
hashie (3.6.0) hashie (4.1.0)
highline (1.7.10) highline (1.7.10)
hkdf (0.3.0) hkdf (0.3.0)
htmlentities (4.3.4) htmlentities (4.3.4)
@ -463,14 +463,12 @@ 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