Skip to content

Commit

Permalink
bump diaspora_federation
Browse files Browse the repository at this point in the history
  • Loading branch information
cmrd-senya authored and jhass committed Dec 13, 2015
1 parent 4e41b8d commit 08b910b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
4 changes: 3 additions & 1 deletion Gemfile
Expand Up @@ -12,7 +12,7 @@ gem "unicorn", "4.9.0", require: false

# Federation

gem "diaspora_federation-rails", "0.0.8"
gem "diaspora_federation-rails", "0.0.9"

# API and JSON

Expand Down Expand Up @@ -269,6 +269,8 @@ group :test do
gem "timecop", "0.8.0"
gem "webmock", "1.22.1", require: false
gem "shoulda-matchers", "3.0.0"

gem "diaspora_federation-test", "0.0.9"
end

group :development, :test do
Expand Down
16 changes: 10 additions & 6 deletions Gemfile.lock
Expand Up @@ -152,15 +152,18 @@ GEM
eventmachine (~> 1.0.8)
http_parser.rb (~> 0.6)
nokogiri (~> 1.6)
diaspora_federation (0.0.8)
faraday (~> 0.9.2)
diaspora_federation (0.0.9)
faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.6)
nokogiri (~> 1.6, >= 1.6.6.4)
typhoeus (~> 0.7)
valid (~> 1.0)
diaspora_federation-rails (0.0.8)
diaspora_federation (= 0.0.8)
diaspora_federation-rails (0.0.9)
diaspora_federation (= 0.0.9)
rails (~> 4.2)
diaspora_federation-test (0.0.9)
diaspora_federation (= 0.0.9)
factory_girl (~> 4.5.0)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.25)
Expand Down Expand Up @@ -776,7 +779,8 @@ DEPENDENCIES
devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6)
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)
eye (= 0.7)
facebox-rails (= 0.2.0)
Expand Down

0 comments on commit 08b910b

Please sign in to comment.