diff --git a/Gemfile b/Gemfile index 0d1a7c3865b00ed0eef104147d66357e2cf99e29..b6bd41bc7ae014763406724759891a6702a72847 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem "unicorn", "4.9.0", require: false # Federation -gem "diaspora_federation-rails", "0.0.9" +gem "diaspora_federation-rails", "0.0.10" # API and JSON @@ -270,7 +270,7 @@ group :test do gem "webmock", "1.22.1", require: false gem "shoulda-matchers", "3.0.0" - gem "diaspora_federation-test", "0.0.9" + gem "diaspora_federation-test", "0.0.10" end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 0a724727593769038e2ff1a9e91db1e237df0c1b..86f84be61398cb1361330e1eb26b3c1ae2f2a123 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -152,17 +152,17 @@ GEM eventmachine (~> 1.0.8) http_parser.rb (~> 0.6) nokogiri (~> 1.6) - diaspora_federation (0.0.9) + diaspora_federation (0.0.10) faraday (~> 0.9.0) faraday_middleware (~> 0.10.0) - nokogiri (~> 1.6, >= 1.6.6.4) + nokogiri (~> 1.6, >= 1.6.7.1) typhoeus (~> 0.7) valid (~> 1.0) - diaspora_federation-rails (0.0.9) - diaspora_federation (= 0.0.9) + diaspora_federation-rails (0.0.10) + diaspora_federation (= 0.0.10) rails (~> 4.2) - diaspora_federation-test (0.0.9) - diaspora_federation (= 0.0.9) + diaspora_federation-test (0.0.10) + diaspora_federation (= 0.0.10) factory_girl (~> 4.5.0) diff-lcs (1.2.5) docile (1.1.5) @@ -778,8 +778,8 @@ DEPENDENCIES devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.2.0.develop) - diaspora_federation-rails (= 0.0.9) - diaspora_federation-test (= 0.0.9) + diaspora_federation-rails (= 0.0.10) + diaspora_federation-test (= 0.0.10) entypo-rails (= 2.2.3) eye (= 0.7) facebox-rails (= 0.2.0)