diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
| commit | 659b8a12ece7110608ee84748e57647c08d1dbda (patch) | |
| tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /config/initializers | |
| parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
| parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) | |
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
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/active_model_serializers.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/active_model_serializers.rb b/config/initializers/active_model_serializers.rb index b0230267d..0e69e1d96 100644 --- 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) |