projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
b1b392e
)
Fix incompatibility with faraday 0.6.2
author
Tom Clegg <tclegg@veritasgenetics.com>
Mon, 30 Sep 2019 15:10:08 +0000
(11:10 -0400)
committer
Ward Vandewege <wvandewege@veritasgenetics.com>
Fri, 4 Oct 2019 21:00:06 +0000
(17:00 -0400)
lib/google/api_client.rb
patch
|
blob
|
history
diff --git
a/lib/google/api_client.rb
b/lib/google/api_client.rb
index 240b1037fbf669db420b71fd63633dd15a25b855..b2fa0b3c447158d1565608b00682745f9a4deb5a 100644
(file)
--- a/
lib/google/api_client.rb
+++ b/
lib/google/api_client.rb
@@
-135,7
+135,13
@@
module Google
faraday.options.params_encoder = Faraday::FlatParamsEncoder
faraday.ssl.ca_file = ca_file
faraday.ssl.verify = true
- faraday.proxy proxy
+ if faraday.respond_to?(:proxy=)
+ # faraday >= 0.6.2
+ faraday.proxy = proxy
+ else
+ # older versions of faraday
+ faraday.proxy proxy
+ end
faraday.adapter Faraday.default_adapter
if options[:faraday_option].is_a?(Hash)
options[:faraday_option].each_pair do |option, value|