diff --git a/Gemfile b/Gemfile index b541e89100bca55ba55495a90d4c6c1cb1eaa37a..bec3c220da617a39fa51e5edd11b99aadacd3448 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem "unicorn", "4.9.0", require: false # Federation -gem "diaspora_federation-rails", "0.0.7" +gem "diaspora_federation-rails", "0.0.8" # API and JSON @@ -160,7 +160,7 @@ gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.1" gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" -gem "typhoeus", "0.7.3" +gem "typhoeus", "0.8.0" # Views diff --git a/Gemfile.lock b/Gemfile.lock index b6f08c63a97f7bc4538fd504f6715e00ef67badc..ee8c0f6ec150c34f33d32d2980bd2963f1c76ac7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,14 +196,14 @@ GEM eventmachine (>= 1.0.5, < 1.1) http_parser.rb (~> 0.6) nokogiri (~> 1.6) - diaspora_federation (0.0.7) + diaspora_federation (0.0.8) faraday (~> 0.9.0) faraday_middleware (~> 0.10.0) nokogiri (~> 1.6, >= 1.6.6) - typhoeus (~> 0.7.0) + typhoeus (~> 0.7) valid (~> 1.0) - diaspora_federation-rails (0.0.7) - diaspora_federation (= 0.0.7) + diaspora_federation-rails (0.0.8) + diaspora_federation (= 0.0.8) rails (~> 4.2) diff-lcs (1.2.5) docile (1.1.5) @@ -770,8 +770,8 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.13.0) unf (~> 0.1.0) - typhoeus (0.7.3) - ethon (>= 0.7.4) + typhoeus (0.8.0) + ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.2) @@ -820,7 +820,7 @@ DEPENDENCIES devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.2.0.develop) - diaspora_federation-rails (= 0.0.7) + diaspora_federation-rails (= 0.0.8) entypo-rails (= 2.2.3) eye (= 0.8.pre) facebox-rails (= 0.2.0) @@ -921,7 +921,7 @@ DEPENDENCIES timecop (= 0.8.0) twitter (= 5.15.0) twitter-text (= 1.13.0) - typhoeus (= 0.7.3) + typhoeus (= 0.8.0) uglifier (= 2.7.2) unicorn (= 4.9.0) uuid (= 2.3.8)