From be9c1bd397656816fbe2f9c9d5d60c5975dbec2d Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Wed, 30 Mar 2016 10:00:24 -0500 Subject: [PATCH] Add CHANGELOG [ci skip] --- CHANGELOG.md | 2 ++ test/support/rails_app.rb | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e31a84f6..f03aa5b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ Features: - [#1340](https://github.com/rails-api/active_model_serializers/pull/1340) Add support for resource-level meta. (@beauby) Fixes: +- [#1480](https://github.com/rails-api/active_model_serializers/pull/1480) Fix setting of cache_store from Rails configuration. (@bf4) + Fix uninentional mutating of value in memory cache store. (@groyoh) - [#1622](https://github.com/rails-api/active_model_serializers/pull/1622) Fragment cache changed from per-record to per-serializer. Now, two serializers that use the same model may be separately cached. (@lserman) - [#1478](https://github.com/rails-api/active_model_serializers/pull/1478) Cache store will now be correctly set when serializers are diff --git a/test/support/rails_app.rb b/test/support/rails_app.rb index 67b7e607..dc1a23d8 100644 --- a/test/support/rails_app.rb +++ b/test/support/rails_app.rb @@ -5,9 +5,6 @@ module ActiveModelSerializers config.secret_key_base = 'abc123' config.active_support.test_order = :random config.action_controller.perform_caching = true - # TODO: figure out why turning on the memory cache changes - # the result of the CacheTest#test_associations_cache_when_updated - # and if it is more correct or less correct. config.action_controller.cache_store = :memory_store end