From 5c4121432c7894a05458e4a7eaf73ad4d790bd64 Mon Sep 17 00:00:00 2001 From: Gauthier Delacroix Date: Tue, 26 Aug 2014 17:17:42 +0200 Subject: [PATCH] Fix #0d31e72 regression https://github.com/rails-api/active_model_serializers/commit/0d31e72d2211b6bf7f0b0420139c4b370d6e986e --- lib/active_model_serializers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb index 01b2ed83..7066ebf4 100644 --- a/lib/active_model_serializers.rb +++ b/lib/active_model_serializers.rb @@ -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)