Skip to content

Commit 427dd05

Browse files
committed
Revert "Update caching.rb"
This reverts commit c6f34eb.
1 parent 192c86a commit 427dd05

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/active_model/serializer/concerns/caching.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def fetch_attributes(fields, cached_attributes, adapter_instance)
231231
def fetch(adapter_instance, cache_options = serializer_class._cache_options, key = nil)
232232
if serializer_class.cache_store
233233
key ||= cache_key(adapter_instance)
234-
cache_options = (cache_options || {}).merge(version: object_cache_version) if object_cache_version
234+
cache_options = cache_options.merge(version: object_cache_version) if object_cache_version
235235
serializer_class.cache_store.fetch(key, cache_options) do
236236
yield
237237
end

0 commit comments

Comments
 (0)