diff --git a/Gemfile b/Gemfile index a5716e277..e12c3319a 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem "unicorn", "5.0.1", require: false # Federation -gem "diaspora_federation-rails", "0.0.12" +gem "diaspora_federation-rails", "0.0.13" # API and JSON @@ -160,7 +160,7 @@ gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.2" gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" -gem "typhoeus", "0.8.0" +gem "typhoeus", "1.0.1" # Views @@ -272,7 +272,7 @@ group :test do gem "webmock", "1.22.6", require: false gem "shoulda-matchers", "3.1.1" - gem "diaspora_federation-test", "0.0.12" + gem "diaspora_federation-test", "0.0.13" end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 6f422d1ff..b1f8b8311 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,17 +155,17 @@ GEM eventmachine (~> 1.0.8) http_parser.rb (~> 0.6) nokogiri (~> 1.6) - diaspora_federation (0.0.12) + diaspora_federation (0.0.13) faraday (~> 0.9.0) faraday_middleware (~> 0.10.0) - nokogiri (~> 1.6, >= 1.6.7.1) - typhoeus (~> 0.7) + nokogiri (~> 1.6, >= 1.6.7.2) + typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-rails (0.0.12) - diaspora_federation (= 0.0.12) + diaspora_federation-rails (0.0.13) + diaspora_federation (= 0.0.13) rails (~> 4.2) - diaspora_federation-test (0.0.12) - diaspora_federation (= 0.0.12) + diaspora_federation-test (0.0.13) + diaspora_federation (= 0.0.13) factory_girl (~> 4.5, >= 4.5.0) diff-lcs (1.2.5) docile (1.1.5) @@ -745,7 +745,7 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.13.3) unf (~> 0.1.0) - typhoeus (0.8.0) + typhoeus (1.0.1) ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -797,8 +797,8 @@ DEPENDENCIES devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.2.0.develop) - diaspora_federation-rails (= 0.0.12) - diaspora_federation-test (= 0.0.12) + diaspora_federation-rails (= 0.0.13) + diaspora_federation-test (= 0.0.13) entypo-rails (= 2.2.3) eye (= 0.7) facebox-rails (= 0.2.0) @@ -900,7 +900,7 @@ DEPENDENCIES turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) twitter-text (= 1.13.3) - typhoeus (= 0.8.0) + typhoeus (= 1.0.1) uglifier (= 2.7.2) unicorn (= 5.0.1) uuid (= 2.3.8)