diff options
author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2010-08-11 21:56:22 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-09-02 11:54:04 +0200 |
commit | 38a421b34d0b414564e919f67d339fac067a56e6 (patch) | |
tree | 049be1f37edf18d380b9e8716e2a3165b67be71e /activerecord | |
parent | c5c839f75f332b02f85fc74f5d1b1347cba411ff (diff) | |
download | rails-38a421b34d0b414564e919f67d339fac067a56e6.tar.gz rails-38a421b34d0b414564e919f67d339fac067a56e6.tar.bz2 rails-38a421b34d0b414564e919f67d339fac067a56e6.zip |
Setup explicit requires for files with exceptions. Removed them from autoloading.
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord')
4 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index c3a34ae104..723466886e 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -22,6 +22,7 @@ require 'active_support/core_ext/object/blank' require 'arel' require 'active_record/errors' require 'active_record/log_subscriber' +require 'action_controller/metal/exceptions' module ActiveRecord #:nodoc: # = Active Record diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 0245e63294..949f432f32 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/array/wrap' +require 'action_controller/metal/exceptions' module ActiveRecord module ConnectionAdapters # :nodoc: diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 198f0a18cb..9dca4a69be 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -1,5 +1,6 @@ require 'active_support/core_ext/kernel/singleton_class' require 'active_support/core_ext/module/aliasing' +require 'action_controller/metal/exceptions' module ActiveRecord # Exception that can be raised to stop migrations from going backwards. diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb index 01cc14b8d6..137d60b350 100644 --- a/activerecord/lib/active_record/session_store.rb +++ b/activerecord/lib/active_record/session_store.rb @@ -1,3 +1,5 @@ +require 'action_controller/metal/exceptions' + module ActiveRecord # = Active Record Session Store # |