ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 23:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against master

Browse Source
This commit is contained in:
twinturbo 2013-02-09 21:03:11 +01:00
parent 5027f04441
commit b854d49298
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/active_model/serializer.rb
View File

@ -302,8 +302,6 @@ module ActiveModel
# Returns a hash representation of the serializable # Returns a hash representation of the serializable
# object without the root. # object without the root.
def serializable_hash def serializable_hash
<<<<<<< HEAD
=======
if perform_caching? if perform_caching?
cache.fetch expand_cache_key([self.class.to_s.underscore, cache_key, 'serializable-hash']) do cache.fetch expand_cache_key([self.class.to_s.underscore, cache_key, 'serializable-hash']) do
_serializable_hash _serializable_hash
@ -455,7 +453,7 @@ module ActiveModel
ActiveSupport::Notifications.instrument(event_name, payload, &block) ActiveSupport::Notifications.instrument(event_name, payload, &block)
end end
end end
# DefaultSerializer # DefaultSerializer
# #
# Provides a constant interface for all items, particularly # Provides a constant interface for all items, particularly