Merge pull request #674 from tricknotes/support-rails4.2-for-ams0.9

Support Rails 4.2.0 with AMS 0.9
This commit is contained in:
Steve Klabnik 2014-10-09 12:38:57 -04:00
commit 784eccd5bc

View File

@ -45,13 +45,15 @@ module ActionController
end end
end end
def _render_option_json(resource, options) [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
serializer = build_json_serializer(resource, options) define_method renderer_method do |resource, options|
serializer = build_json_serializer(resource, options)
if serializer if serializer
super(serializer, options) super(serializer, options)
else else
super super(resource, options)
end
end end
end end