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

Merge pull request #852 from mateomurphy/serializer-options-fix

Browse Source 
Fix options merge order in `each_association`
This commit is contained in:
Guillermo Iguaran
2015-03-22 18:54:07 -05:00
parent e901a2108f 03372ea61d
commit b68d7f4826
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/active_model/serializer.rb
View File

@@ -187,7 +187,7 @@ module ActiveModel
serializer = serializer_class.new(
association_value,
serializer_from_options(association_options).merge(options)
options.merge(serializer_from_options(association_options))
) if serializer_class
if block_given?