From 427dd05a737bedaa71a3a315927b115099c6be08 Mon Sep 17 00:00:00 2001 From: cintamani Date: Mon, 28 Jan 2019 11:05:19 +0000 Subject: [PATCH] Revert "Update caching.rb" This reverts commit c6f34eb9e9df86b568b9463e2ea8c26f0f43a838. --- lib/active_model/serializer/concerns/caching.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_model/serializer/concerns/caching.rb b/lib/active_model/serializer/concerns/caching.rb index 3da820e2..ed893e3d 100644 --- a/lib/active_model/serializer/concerns/caching.rb +++ b/lib/active_model/serializer/concerns/caching.rb @@ -231,7 +231,7 @@ module ActiveModel def fetch(adapter_instance, cache_options = serializer_class._cache_options, key = nil) if serializer_class.cache_store key ||= cache_key(adapter_instance) - cache_options = (cache_options || {}).merge(version: object_cache_version) if object_cache_version + cache_options = cache_options.merge(version: object_cache_version) if object_cache_version serializer_class.cache_store.fetch(key, cache_options) do yield end