Commit 8de29bc2 authored by Jonne Haß's avatar Jonne Haß
Browse files

bump faraday and faraday_middleware. closes #4950

parent ac998407
......@@ -116,8 +116,8 @@ gem 'acts-as-taggable-on', '3.3.0'
# URIs and HTTP
gem 'addressable', '2.3.6', :require => 'addressable/uri'
gem 'faraday', '0.8.9'
gem 'faraday_middleware', '0.9.0'
gem 'faraday', '0.9.0'
gem 'faraday_middleware', '0.9.1'
gem 'typhoeus', '0.6.9'
# Views
......
......@@ -141,10 +141,10 @@ GEM
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
faraday (0.8.9)
multipart-post (~> 1.2.0)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.9.1)
faraday (>= 0.7.4, < 0.10)
ffi (1.9.3)
fixture_builder (0.3.6)
activerecord (>= 2)
......@@ -267,7 +267,7 @@ GEM
multi_json (1.10.1)
multi_test (0.1.1)
multi_xml (0.5.5)
multipart-post (1.2.0)
multipart-post (2.0.0)
mysql2 (0.3.16)
nested_form (0.3.2)
net-scp (1.2.1)
......@@ -509,8 +509,8 @@ DEPENDENCIES
devise_lastseenable (= 0.0.4)
entypo-rails (= 2.2.2)
factory_girl_rails (= 4.4.1)
faraday (= 0.8.9)
faraday_middleware (= 0.9.0)
faraday (= 0.9.0)
faraday_middleware (= 0.9.1)
fixture_builder (= 0.3.6)
fog (= 1.23.0)
foreigner (= 1.6.1)
......
......@@ -2,7 +2,9 @@
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
options = {
timeout: 25,
request: {
timeout: 25
},
ssl: {
ca_file: AppConfig.environment.certificate_authorities.get
}
......
......@@ -76,8 +76,8 @@ module Diaspora; module Fetcher; class Public
FEDERATION_LOGGER.info "fetching public posts for #{@person.diaspora_handle}"
resp = Faraday.get("#{@person.url}people/#{@person.guid}") do |req|
req.headers[:accept] = 'application/json'
req.headers[:user_agent] = 'diaspora-fetcher'
req.headers['Accept'] = 'application/json'
req.headers['User-Agent'] = 'diaspora-fetcher'
end
FEDERATION_LOGGER.debug resp.body.to_s[0..250]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment