Merge branch 'master' into develop

Changelog.md

@@ -1,3 +1,9 @@
+# 0.1.9
+
+## Bug fixes
+
+* Don't log encrypted private messages [8859c96](https://github.com/diaspora/diaspora_federation/commit/8859c960ac2b771399ad42ccf795043aea4ec9a5)
+
 # 0.1.8
 
 ## Feature

Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    diaspora_federation (0.1.8)
+    diaspora_federation (0.1.9)
       faraday (>= 0.9.0, < 0.13.0)
       faraday_middleware (>= 0.10.0, < 0.12.0)
       nokogiri (~> 1.6, >= 1.6.8)
       typhoeus (~> 1.0)
       valid (~> 1.0)
-    diaspora_federation-json_schema (0.1.8)
-    diaspora_federation-rails (0.1.8)
+    diaspora_federation-json_schema (0.1.9)
+    diaspora_federation-rails (0.1.9)
       actionpack (>= 4.2, < 6)
-      diaspora_federation (= 0.1.8)
-    diaspora_federation-test (0.1.8)
-      diaspora_federation (= 0.1.8)
+      diaspora_federation (= 0.1.9)
+    diaspora_federation-test (0.1.9)
+      diaspora_federation (= 0.1.9)
       fabrication (~> 2.16.0)
       uuid (~> 2.3.8)
 

config/initializers/filter_parameter_logging.rb

@@ -1,2 +1,2 @@
 # Don't log received xml data.
-Rails.application.config.filter_parameters += [:xml]
+Rails.application.config.filter_parameters += %i(xml aes_key encrypted_magic_envelope)

lib/diaspora_federation/version.rb

@@ -1,4 +1,4 @@
 module DiasporaFederation
   # the gem version
-  VERSION = "0.1.8".freeze
+  VERSION = "0.1.9".freeze
 end