Bump faraday
This commit is contained in:
parent
1bd0c7bb2d
commit
62fdac807e
3 changed files with 11 additions and 25 deletions
3
Gemfile
3
Gemfile
|
|
@ -146,9 +146,10 @@ gem "acts-as-taggable-on", "9.0.1"
|
||||||
# URIs and HTTP
|
# URIs and HTTP
|
||||||
|
|
||||||
gem "addressable", "2.8.4", require: "addressable/uri"
|
gem "addressable", "2.8.4", require: "addressable/uri"
|
||||||
gem "faraday", "1.10.0"
|
gem "faraday", "2.7.7"
|
||||||
gem "faraday-cookie_jar", "0.0.7"
|
gem "faraday-cookie_jar", "0.0.7"
|
||||||
gem "faraday-follow_redirects", "0.3.0"
|
gem "faraday-follow_redirects", "0.3.0"
|
||||||
|
gem "faraday-typhoeus", "1.0.0", require: false
|
||||||
gem "typhoeus", "1.4.0"
|
gem "typhoeus", "1.4.0"
|
||||||
|
|
||||||
# Views
|
# Views
|
||||||
|
|
|
||||||
31
Gemfile.lock
31
Gemfile.lock
|
|
@ -248,34 +248,18 @@ GEM
|
||||||
factory_bot_rails (6.2.0)
|
factory_bot_rails (6.2.0)
|
||||||
factory_bot (~> 6.2.0)
|
factory_bot (~> 6.2.0)
|
||||||
railties (>= 5.0.0)
|
railties (>= 5.0.0)
|
||||||
faraday (1.10.0)
|
faraday (2.7.7)
|
||||||
faraday-em_http (~> 1.0)
|
faraday-net_http (>= 2.0, < 3.1)
|
||||||
faraday-em_synchrony (~> 1.0)
|
|
||||||
faraday-excon (~> 1.1)
|
|
||||||
faraday-httpclient (~> 1.0)
|
|
||||||
faraday-multipart (~> 1.0)
|
|
||||||
faraday-net_http (~> 1.0)
|
|
||||||
faraday-net_http_persistent (~> 1.0)
|
|
||||||
faraday-patron (~> 1.0)
|
|
||||||
faraday-rack (~> 1.0)
|
|
||||||
faraday-retry (~> 1.0)
|
|
||||||
ruby2_keywords (>= 0.0.4)
|
ruby2_keywords (>= 0.0.4)
|
||||||
faraday-cookie_jar (0.0.7)
|
faraday-cookie_jar (0.0.7)
|
||||||
faraday (>= 0.8.0)
|
faraday (>= 0.8.0)
|
||||||
http-cookie (~> 1.0.0)
|
http-cookie (~> 1.0.0)
|
||||||
faraday-em_http (1.0.0)
|
|
||||||
faraday-em_synchrony (1.0.0)
|
|
||||||
faraday-excon (1.1.0)
|
|
||||||
faraday-follow_redirects (0.3.0)
|
faraday-follow_redirects (0.3.0)
|
||||||
faraday (>= 1, < 3)
|
faraday (>= 1, < 3)
|
||||||
faraday-httpclient (1.0.1)
|
faraday-net_http (3.0.2)
|
||||||
faraday-multipart (1.0.4)
|
faraday-typhoeus (1.0.0)
|
||||||
multipart-post (~> 2)
|
faraday (~> 2.0)
|
||||||
faraday-net_http (1.0.1)
|
typhoeus (~> 1.4)
|
||||||
faraday-net_http_persistent (1.2.0)
|
|
||||||
faraday-patron (1.0.0)
|
|
||||||
faraday-rack (1.0.0)
|
|
||||||
faraday-retry (1.0.3)
|
|
||||||
ferrum (0.13)
|
ferrum (0.13)
|
||||||
addressable (~> 2.5)
|
addressable (~> 2.5)
|
||||||
concurrent-ruby (~> 1.1)
|
concurrent-ruby (~> 1.1)
|
||||||
|
|
@ -816,9 +800,10 @@ DEPENDENCIES
|
||||||
diaspora_federation-test (= 1.1.0)
|
diaspora_federation-test (= 1.1.0)
|
||||||
eye (= 0.10.0)
|
eye (= 0.10.0)
|
||||||
factory_bot_rails (= 6.2.0)
|
factory_bot_rails (= 6.2.0)
|
||||||
faraday (= 1.10.0)
|
faraday (= 2.7.7)
|
||||||
faraday-cookie_jar (= 0.0.7)
|
faraday-cookie_jar (= 0.0.7)
|
||||||
faraday-follow_redirects (= 0.3.0)
|
faraday-follow_redirects (= 0.3.0)
|
||||||
|
faraday-typhoeus (= 1.0.0)
|
||||||
fixture_builder (= 0.5.2)
|
fixture_builder (= 0.5.2)
|
||||||
fog-aws (= 3.19.0)
|
fog-aws (= 3.19.0)
|
||||||
fuubar (= 2.5.1)
|
fuubar (= 2.5.1)
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
# Use net_http in test, that's better supported by webmock
|
# Use net_http in test, that's better supported by webmock
|
||||||
unless Rails.env.test?
|
unless Rails.env.test?
|
||||||
require 'typhoeus/adapters/faraday'
|
require "faraday/typhoeus"
|
||||||
Faraday.default_adapter = :typhoeus
|
Faraday.default_adapter = :typhoeus
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue