bump diaspora_federation

This commit is contained in:
cmrd Senya 2015-11-30 18:13:19 +03:00 committed by Jonne Haß
parent 4e41b8dc86
commit 08b910bd88
2 changed files with 13 additions and 7 deletions

View file

@ -12,7 +12,7 @@ gem "unicorn", "4.9.0", require: false
# Federation # Federation
gem "diaspora_federation-rails", "0.0.8" gem "diaspora_federation-rails", "0.0.9"
# API and JSON # API and JSON
@ -269,6 +269,8 @@ group :test do
gem "timecop", "0.8.0" gem "timecop", "0.8.0"
gem "webmock", "1.22.1", require: false gem "webmock", "1.22.1", require: false
gem "shoulda-matchers", "3.0.0" gem "shoulda-matchers", "3.0.0"
gem "diaspora_federation-test", "0.0.9"
end end
group :development, :test do group :development, :test do

View file

@ -152,15 +152,18 @@ GEM
eventmachine (~> 1.0.8) eventmachine (~> 1.0.8)
http_parser.rb (~> 0.6) http_parser.rb (~> 0.6)
nokogiri (~> 1.6) nokogiri (~> 1.6)
diaspora_federation (0.0.8) diaspora_federation (0.0.9)
faraday (~> 0.9.2) faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0) faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.6) nokogiri (~> 1.6, >= 1.6.6.4)
typhoeus (~> 0.7) typhoeus (~> 0.7)
valid (~> 1.0) valid (~> 1.0)
diaspora_federation-rails (0.0.8) diaspora_federation-rails (0.0.9)
diaspora_federation (= 0.0.8) diaspora_federation (= 0.0.9)
rails (~> 4.2) rails (~> 4.2)
diaspora_federation-test (0.0.9)
diaspora_federation (= 0.0.9)
factory_girl (~> 4.5.0)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
domain_name (0.5.25) domain_name (0.5.25)
@ -776,7 +779,8 @@ DEPENDENCIES
devise-token_authenticatable (~> 0.4.0) devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6) devise_lastseenable (= 0.0.6)
diaspora-vines (~> 0.2.0.develop) diaspora-vines (~> 0.2.0.develop)
diaspora_federation-rails (= 0.0.8) diaspora_federation-rails (= 0.0.9)
diaspora_federation-test (= 0.0.9)
entypo-rails (= 2.2.3) entypo-rails (= 2.2.3)
eye (= 0.7) eye (= 0.7)
facebox-rails (= 0.2.0) facebox-rails (= 0.2.0)