From d79c2e511b2a463d0d33ebe963b2d09fe14b0f31 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Tue, 25 Apr 2017 01:03:34 +0200
Subject: [PATCH] Bump diaspora_federation

---
 Gemfile      |  4 ++--
 Gemfile.lock | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 634196383..f27b8d1a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
 
-gem "diaspora_federation-rails", "0.1.9"
+gem "diaspora_federation-rails", "0.2.0"
 
 # API and JSON
 
@@ -292,7 +292,7 @@ group :test do
   gem "webmock",            "2.3.2", require: false
   gem "shoulda-matchers",   "3.1.1"
 
-  gem "diaspora_federation-test", "0.1.9"
+  gem "diaspora_federation-test", "0.2.0"
 
   # Coverage
   gem 'coveralls', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 50fc95720..e70cd54c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,18 +163,18 @@ GEM
       devise
       rails (>= 3.0.4)
     diaspora-prosody-config (0.0.7)
-    diaspora_federation (0.1.9)
-      faraday (>= 0.9.0, < 0.12.0)
+    diaspora_federation (0.2.0)
+      faraday (>= 0.9.0, < 0.13.0)
       faraday_middleware (>= 0.10.0, < 0.12.0)
       nokogiri (~> 1.6, >= 1.6.8)
       typhoeus (~> 1.0)
       valid (~> 1.0)
-    diaspora_federation-rails (0.1.9)
-      diaspora_federation (= 0.1.9)
-      rails (>= 4.2, < 6)
-    diaspora_federation-test (0.1.9)
-      diaspora_federation (= 0.1.9)
-      factory_girl (~> 4.7)
+    diaspora_federation-rails (0.2.0)
+      actionpack (>= 4.2, < 6)
+      diaspora_federation (= 0.2.0)
+    diaspora_federation-test (0.2.0)
+      diaspora_federation (= 0.2.0)
+      fabrication (~> 2.16.0)
       uuid (~> 2.3.8)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -198,6 +198,7 @@ GEM
       sigar (~> 0.7.3)
       state_machines
       thor
+    fabrication (2.16.1)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.8.0)
@@ -775,8 +776,8 @@ DEPENDENCIES
   devise (= 4.2.0)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
-  diaspora_federation-rails (= 0.1.9)
-  diaspora_federation-test (= 0.1.9)
+  diaspora_federation-rails (= 0.2.0)
+  diaspora_federation-test (= 0.2.0)
   entypo-rails (= 3.0.0)
   eye (= 0.9.1)
   factory_girl_rails (= 4.8.0)