diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-02 21:10:29 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-02 21:11:03 +0200 |
| commit | 599e46bf24419a429ee0bb0ea02afd48f47aa4ec (patch) | |
| tree | 725252bd044bd41ec1952be7a65265576302dc2a /activerecord | |
| parent | 13d2a081645db873379668b6f21e449201b6b036 (diff) | |
| download | rails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.tar.gz rails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.tar.bz2 rails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.zip | |
Revert "Setup explicit requires for files with exceptions. Removed them from autoloading."
Booting a new Rails application does not work after this commit [#5359 state:open]
This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6.
Diffstat (limited to 'activerecord')
4 files changed, 0 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 723466886e..c3a34ae104 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -22,7 +22,6 @@ 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 949f432f32..0245e63294 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -1,5 +1,4 @@ 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 9dca4a69be..198f0a18cb 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -1,6 +1,5 @@ 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 137d60b350..01cc14b8d6 100644 --- a/activerecord/lib/active_record/session_store.rb +++ b/activerecord/lib/active_record/session_store.rb @@ -1,5 +1,3 @@ -require 'action_controller/metal/exceptions' - module ActiveRecord # = Active Record Session Store # |