Fix load-order issues

This commit is contained in:
Benjamin Fleischer 2015-12-21 00:12:52 -06:00
parent 94db22c1e0
commit fe015d17f2

View File

@ -2,17 +2,13 @@ require 'active_model'
require 'active_support'
require 'action_controller'
require 'action_controller/railtie'
require 'active_model/serializer/version'
require 'active_model/serializer'
require 'active_model_serializers/railtie'
module ActiveModelSerializers
extend ActiveSupport::Autoload
autoload :Model
autoload :Callbacks
autoload :Deserialization
autoload :Logging
require 'active_model/serializable_resource'
require 'action_controller/serialization'
autoload :Test
mattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
@ -20,10 +16,9 @@ module ActiveModelSerializers
ActiveModel::Serializer.config
end
extend ActiveSupport::Autoload
autoload :Model
autoload :Callbacks
autoload :Deserialization
autoload :Logging
autoload :Test
require 'active_model/serializer/version'
require 'active_model/serializer'
require 'active_model_serializers/railtie'
require 'active_model/serializable_resource'
require 'action_controller/serialization'
end