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

Merge pull request #48 from joliss/simplify

Browse Source 
Simplify code
This commit is contained in:
Yehuda Katz 2012-04-25 10:51:42 -07:00
commit 6a2103bcb6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/action_controller/serialization.rb
View File

@ -49,12 +49,7 @@ module ActionController
if serializer if serializer
options[:scope] = serialization_scope options[:scope] = serialization_scope
json = serializer.new(json, options.merge(default_serializer_options || {}))
if default_options = default_serializer_options
options = options.merge(default_options)
end
json = serializer.new(json, options)
end end
super super
end end