Unverified Commit cd4f2841 authored by Dennis Schubert's avatar Dennis Schubert

Merge pull request #7017 from SuperTux88/bump-diaspora_federation

bump diaspora_federation
parents 8445321a b3013c81
......@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4"
# Federation
gem "diaspora_federation-rails", "0.1.3"
gem "diaspora_federation-rails", "0.1.4"
# API and JSON
......@@ -287,7 +287,7 @@ group :test do
gem "webmock", "2.1.0", require: false
gem "shoulda-matchers", "3.1.1"
gem "diaspora_federation-test", "0.1.3"
gem "diaspora_federation-test", "0.1.4"
# Coverage
gem 'coveralls', require: false
......
......@@ -177,17 +177,17 @@ GEM
devise
rails (>= 3.0.4)
diaspora-prosody-config (0.0.5)
diaspora_federation (0.1.3)
diaspora_federation (0.1.4)
faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.8)
typhoeus (~> 1.0)
valid (~> 1.0)
diaspora_federation-rails (0.1.3)
diaspora_federation (= 0.1.3)
diaspora_federation-rails (0.1.4)
diaspora_federation (= 0.1.4)
rails (~> 4.2)
diaspora_federation-test (0.1.3)
diaspora_federation (= 0.1.3)
diaspora_federation-test (0.1.4)
diaspora_federation (= 0.1.4)
factory_girl (~> 4.7)
diff-lcs (1.2.5)
docile (1.1.5)
......@@ -934,8 +934,8 @@ DEPENDENCIES
devise-token_authenticatable (= 0.5.2)
devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.5)
diaspora_federation-rails (= 0.1.3)
diaspora_federation-test (= 0.1.3)
diaspora_federation-rails (= 0.1.4)
diaspora_federation-test (= 0.1.4)
entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.8.1)
factory_girl_rails (= 4.7.0)
......
......@@ -18,6 +18,7 @@ module Workers
DiasporaFederation::Salmon::SenderKeyNotFound,
DiasporaFederation::Salmon::InvalidEnvelope,
DiasporaFederation::Salmon::InvalidSignature,
DiasporaFederation::Salmon::InvalidDataType,
DiasporaFederation::Salmon::InvalidAlgorithm,
DiasporaFederation::Salmon::InvalidEncoding,
Diaspora::Federation::AuthorIgnored,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment