From ebfb901b3997256b02ffa8821518169289c0f3a5 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 23 Jan 2016 03:24:25 +0100
Subject: [PATCH] update federation gem to prevent locale leakage in receive
requests
closes #6651
---
Gemfile | 4 ++--
Gemfile.lock | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index ba6a6c23b5..deeba9bdd3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "unicorn", "5.0.1", require: false
# Federation
-gem "diaspora_federation-rails", "0.0.11"
+gem "diaspora_federation-rails", "0.0.12"
# 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.11"
+ gem "diaspora_federation-test", "0.0.12"
end
group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d148441b2..1eca8b1e35 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,17 +150,17 @@ GEM
eventmachine (~> 1.0.8)
http_parser.rb (~> 0.6)
nokogiri (~> 1.6)
- diaspora_federation (0.0.11)
+ diaspora_federation (0.0.12)
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.11)
- diaspora_federation (= 0.0.11)
+ diaspora_federation-rails (0.0.12)
+ diaspora_federation (= 0.0.12)
rails (~> 4.2)
- diaspora_federation-test (0.0.11)
- diaspora_federation (= 0.0.11)
+ diaspora_federation-test (0.0.12)
+ diaspora_federation (= 0.0.12)
factory_girl (~> 4.5, >= 4.5.0)
diff-lcs (1.2.5)
docile (1.1.5)
@@ -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.11)
- diaspora_federation-test (= 0.0.11)
+ diaspora_federation-rails (= 0.0.12)
+ diaspora_federation-test (= 0.0.12)
entypo-rails (= 2.2.3)
eye (= 0.7)
facebox-rails (= 0.2.0)
--
GitLab