update federation gem to prevent locale leakage in receive requests
closes #6651
This commit is contained in:
parent
072ce711d2
commit
ebfb901b39
2 changed files with 9 additions and 9 deletions
4
Gemfile
4
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
|
||||
|
|
|
|||
14
Gemfile.lock
14
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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue