Merge pull request #611 from gauthier-delacroix/Fix-0d31e72

Fix #0d31e72 regression
This commit is contained in:
Steve Klabnik 2014-08-26 11:41:03 -04:00
commit d5a993e193

View File

@ -9,7 +9,7 @@ begin
require 'action_controller/serialization'
require 'action_controller/serialization_test_case'
ActiveSupport.on_load(:after_initialize) do
ActiveSupport.on_load(:action_controller) do
if ::ActionController::Serialization.enabled
ActionController::Base.send(:include, ::ActionController::Serialization)
ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)