Always pull in version for frameworks (standardize autoload / require / none)
This commit is contained in:
parent
de05e1c33c
commit
cc8e386d08
@ -26,6 +26,7 @@
|
||||
|
||||
require 'abstract_controller'
|
||||
require 'action_view'
|
||||
require 'action_mailer/version'
|
||||
|
||||
# Common Active Support usage in Action Mailer
|
||||
require 'active_support/core_ext/class'
|
||||
|
@ -24,7 +24,7 @@
|
||||
activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
|
||||
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
|
||||
require 'active_support'
|
||||
|
||||
require 'active_model/version'
|
||||
|
||||
module ActiveModel
|
||||
extend ActiveSupport::Autoload
|
||||
@ -45,7 +45,6 @@ module ActiveModel
|
||||
autoload :Serialization
|
||||
autoload :TestCase
|
||||
autoload :Translation
|
||||
autoload :VERSION
|
||||
autoload :Validations
|
||||
autoload :Validator
|
||||
|
||||
|
@ -33,12 +33,12 @@
|
||||
require 'active_model'
|
||||
require 'arel'
|
||||
|
||||
require 'active_record/version'
|
||||
|
||||
module ActiveRecord
|
||||
extend ActiveSupport::Autoload
|
||||
|
||||
eager_autoload do
|
||||
autoload :VERSION
|
||||
|
||||
autoload :ActiveRecordError, 'active_record/errors'
|
||||
autoload :ConnectionNotEstablished, 'active_record/errors'
|
||||
|
||||
|
@ -29,6 +29,7 @@
|
||||
|
||||
require 'active_support'
|
||||
require 'active_model'
|
||||
require 'active_resource/version'
|
||||
|
||||
module ActiveResource
|
||||
extend ActiveSupport::Autoload
|
||||
|
@ -35,6 +35,7 @@ def load_all!; load_all_hooks.each { |hook| hook.call } end
|
||||
end
|
||||
|
||||
require "active_support/dependencies/autoload"
|
||||
require "active_support/version"
|
||||
|
||||
module ActiveSupport
|
||||
extend ActiveSupport::Autoload
|
||||
@ -43,7 +44,6 @@ module ActiveSupport
|
||||
autoload :FileUpdateChecker
|
||||
autoload :LogSubscriber
|
||||
autoload :Notifications
|
||||
autoload :VERSION
|
||||
|
||||
# TODO: Narrow this list down
|
||||
eager_autoload do
|
||||
|
Loading…
Reference in New Issue
Block a user