From 0382cb48c15e48ea74397b5082541b1a4fbf1cc8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 3 Jul 2022 17:29:31 +0200 Subject: [PATCH] Bump diaspora_federation to support rails 6 --- Gemfile | 6 +++--- Gemfile.lock | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index 7ac950de9..1cd81b9ca 100644 --- a/Gemfile +++ b/Gemfile @@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.5" # Federation -gem "diaspora_federation-json_schema", "0.2.7" -gem "diaspora_federation-rails", "0.2.7" +gem "diaspora_federation-json_schema", "0.2.8" +gem "diaspora_federation-rails", "0.2.8" # API and JSON @@ -278,7 +278,7 @@ group :test do gem "timecop", "0.9.5" gem "webmock", "3.14.0", require: false - gem "diaspora_federation-test", "0.2.7" + gem "diaspora_federation-test", "0.2.8" end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index d4d582486..b8e0077a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,18 +190,18 @@ GEM devise rails (>= 3.0.4) diaspora-prosody-config (0.0.7) - diaspora_federation (0.2.7) + diaspora_federation (0.2.8) faraday (>= 0.9.0, < 1.0) faraday_middleware (>= 0.10.0, < 1.0) nokogiri (~> 1.6, >= 1.6.8) typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-json_schema (0.2.7) - diaspora_federation-rails (0.2.7) - actionpack (>= 4.2, < 6) - diaspora_federation (= 0.2.7) - diaspora_federation-test (0.2.7) - diaspora_federation (= 0.2.7) + diaspora_federation-json_schema (0.2.8) + diaspora_federation-rails (0.2.8) + actionpack (>= 4.2, < 7) + diaspora_federation (= 0.2.8) + diaspora_federation-test (0.2.8) + diaspora_federation (= 0.2.8) fabrication (~> 2.16) uuid (~> 2.3, >= 2.3.8) diff-lcs (1.5.0) @@ -796,9 +796,9 @@ DEPENDENCIES devise-two-factor (= 4.0.2) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) - diaspora_federation-json_schema (= 0.2.7) - diaspora_federation-rails (= 0.2.7) - diaspora_federation-test (= 0.2.7) + diaspora_federation-json_schema (= 0.2.8) + diaspora_federation-rails (= 0.2.8) + diaspora_federation-test (= 0.2.8) eye (= 0.10.0) factory_girl_rails (= 4.9.0) faraday (= 0.17.5)