ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix-jsonapi-ri

Browse Source
This commit is contained in:
Lucas Hosseini
2015-09-06 17:21:43 +02:00
parent 3793f3ff4b f2279946b6
commit 070a2e63bd
65 changed files with 1013 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/active_model/serializer.rb
View File

@@ -13,7 +13,6 @@ module ActiveModel
include Configuration
include Associations
# Matches
# "c:/git/emberjs/ember-crm-backend/app/serializers/lead_serializer.rb:1:in `<top (required)>'"
# AND
@@ -70,7 +69,7 @@ module ActiveModel
ActiveModelSerializers.silence_warnings do
define_method key do
object.read_attribute_for_serialization(attr)
end unless respond_to?(key, false) || _fragmented.respond_to?(attr)
end unless (key != :id && method_defined?(key)) || _fragmented.respond_to?(attr)
end
end