From 2aaf45166bebf353e5d41e74b3ae81334bb4eca4 Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Wed, 23 Dec 2015 20:56:24 +0300
Subject: [PATCH] bump diaspora_federation
---
Gemfile | 4 ++--
Gemfile.lock | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Gemfile b/Gemfile
index 525645e022..2351ff5dab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "unicorn", "5.0.1", require: false
# Federation
-gem "diaspora_federation-rails", "0.0.10"
+gem "diaspora_federation-rails", "0.0.11"
# API and JSON
@@ -270,7 +270,7 @@ group :test do
gem "webmock", "1.22.3", require: false
gem "shoulda-matchers", "3.0.1"
- gem "diaspora_federation-test", "0.0.10"
+ gem "diaspora_federation-test", "0.0.11"
end
group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index bc1aa99590..f55ff76967 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,18 +150,18 @@ GEM
eventmachine (~> 1.0.8)
http_parser.rb (~> 0.6)
nokogiri (~> 1.6)
- diaspora_federation (0.0.10)
+ diaspora_federation (0.0.11)
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.10)
- diaspora_federation (= 0.0.10)
+ diaspora_federation-rails (0.0.11)
+ diaspora_federation (= 0.0.11)
rails (~> 4.2)
- diaspora_federation-test (0.0.10)
- diaspora_federation (= 0.0.10)
- factory_girl (~> 4.5.0)
+ diaspora_federation-test (0.0.11)
+ diaspora_federation (= 0.0.11)
+ factory_girl (~> 4.5, >= 4.5.0)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.25)
@@ -792,8 +792,8 @@ DEPENDENCIES
devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6)
diaspora-vines (~> 0.2.0.develop)
- diaspora_federation-rails (= 0.0.10)
- diaspora_federation-test (= 0.0.10)
+ diaspora_federation-rails (= 0.0.11)
+ diaspora_federation-test (= 0.0.11)
entypo-rails (= 2.2.3)
eye (= 0.7)
facebox-rails (= 0.2.0)
--
GitLab