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

Fix #0d31e72 regression

Author: steveklabnik

lib/active_model_serializers.rb

@@ -9,7 +9,7 @@
   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)