diff --git a/Gemfile b/Gemfile index 63e247471..2e3ed7eb5 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem "unicorn", "5.0.1", require: false # Federation -gem "diaspora_federation-rails", "0.0.11" +gem "diaspora_federation-rails", "0.0.12" # API and JSON @@ -291,7 +291,7 @@ group :test do gem "webmock", "1.22.3", require: false gem "shoulda-matchers", "3.0.1" - gem "diaspora_federation-test", "0.0.11" + gem "diaspora_federation-test", "0.0.12" end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index d18cdeede..6e43db2e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -158,17 +158,17 @@ GEM eventmachine (~> 1.0.8) http_parser.rb (~> 0.6) nokogiri (~> 1.6) - diaspora_federation (0.0.11) + diaspora_federation (0.0.12) faraday (~> 0.9.0) faraday_middleware (~> 0.10.0) nokogiri (~> 1.6, >= 1.6.7.1) typhoeus (~> 0.7) valid (~> 1.0) - diaspora_federation-rails (0.0.11) - diaspora_federation (= 0.0.11) + diaspora_federation-rails (0.0.12) + diaspora_federation (= 0.0.12) rails (~> 4.2) - diaspora_federation-test (0.0.11) - diaspora_federation (= 0.0.11) + diaspora_federation-test (0.0.12) + diaspora_federation (= 0.0.12) factory_girl (~> 4.5, >= 4.5.0) diff-lcs (1.2.5) docile (1.1.5) @@ -897,6 +897,8 @@ DEPENDENCIES diaspora-vines (~> 0.2.0.develop) diaspora_federation-rails (= 0.0.11) diaspora_federation-test (= 0.0.11) + diaspora_federation-rails (= 0.0.12) + diaspora_federation-test (= 0.0.12) entypo-rails (= 3.0.0.pre.rc2) eye (= 0.7) factory_girl_rails (= 4.5.0)