Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes
2018-05-27 13:20:15 +02:00
parent c2e528916c 63c7b91572
commit 659b8a12ec
51 changed files with 716 additions and 476 deletions
--- a/config/initializers/active_model_serializers.rb
+++ b/config/initializers/active_model_serializers.rb
@ -1,3 +1,5 @@
 ActiveModelSerializers.config.tap do |config|
  config.default_includes = '**'
 end
+
+ActiveSupport::Notifications.unsubscribe(ActiveModelSerializers::Logging::RENDER_EVENT)