From 48ebd571d87c2ca273d60fb60f25bd08c6dc2d83 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Fri, 5 Oct 2018 22:29:38 +0200
Subject: [PATCH] Bump diaspora_federation

closes #7876
---
 Gemfile      |  6 +++---
 Gemfile.lock | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2fe18c0a0..80a201bf9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
 
-gem "diaspora_federation-json_schema", "0.2.4"
-gem "diaspora_federation-rails", "0.2.4"
+gem "diaspora_federation-json_schema", "0.2.5"
+gem "diaspora_federation-rails", "0.2.5"
 
 # API and JSON
 
@@ -294,7 +294,7 @@ group :test do
   gem "timecop",            "0.9.1"
   gem "webmock",            "3.3.0", require: false
 
-  gem "diaspora_federation-test", "0.2.4"
+  gem "diaspora_federation-test", "0.2.5"
 
   # Coverage
   gem "coveralls", "0.8.21", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 97e0c1e0f..358e49513 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -166,18 +166,18 @@ GEM
       devise
       rails (>= 3.0.4)
     diaspora-prosody-config (0.0.7)
-    diaspora_federation (0.2.4)
-      faraday (>= 0.9.0, < 0.15.0)
+    diaspora_federation (0.2.5)
+      faraday (>= 0.9.0, < 0.16.0)
       faraday_middleware (>= 0.10.0, < 0.13.0)
       nokogiri (~> 1.6, >= 1.6.8)
       typhoeus (~> 1.0)
       valid (~> 1.0)
-    diaspora_federation-json_schema (0.2.4)
-    diaspora_federation-rails (0.2.4)
+    diaspora_federation-json_schema (0.2.5)
+    diaspora_federation-rails (0.2.5)
       actionpack (>= 4.2, < 6)
-      diaspora_federation (= 0.2.4)
-    diaspora_federation-test (0.2.4)
-      diaspora_federation (= 0.2.4)
+      diaspora_federation (= 0.2.5)
+    diaspora_federation-test (0.2.5)
+      diaspora_federation (= 0.2.5)
       fabrication (~> 2.16)
       uuid (~> 2.3, >= 2.3.8)
     diff-lcs (1.3)
@@ -778,9 +778,9 @@ DEPENDENCIES
   devise (= 4.4.3)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
-  diaspora_federation-json_schema (= 0.2.4)
-  diaspora_federation-rails (= 0.2.4)
-  diaspora_federation-test (= 0.2.4)
+  diaspora_federation-json_schema (= 0.2.5)
+  diaspora_federation-rails (= 0.2.5)
+  diaspora_federation-test (= 0.2.5)
   entypo-rails (= 3.0.0)
   eye (= 0.10.0)
   factory_girl_rails (= 4.8.0)