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 #675 from tricknotes/support-rails4.2

Browse Source 
Support Rails 4.2.0
This commit is contained in:
Steve Klabnik
2014-10-09 12:39:07 -04:00
parent c5294086ea 4fe9790bfa
commit 97023db904
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/action_controller/serialization.rb
View File

@@ -6,7 +6,8 @@ module ActionController
include ActionController::Renderers
def _render_option_json(resource, options)
[:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
define_method renderer_method do |resource, options|
serializer = ActiveModel::Serializer.serializer_for(resource)
if serializer
@@ -16,7 +17,8 @@ module ActionController
super(adapter, options)
else
super
super(resource, options)
end
end
end
end