diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-11-25 18:11:38 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-11-25 18:16:41 +0100 |
| commit | 9e9793b440c044b765f2d1f702feeb92aef2b139 (patch) | |
| tree | 45c6821f9f7801e90f896ae50d01b3fc46046e55 /activerecord | |
| parent | c310be0e8b800d01446fbd393f1a14adb1b45179 (diff) | |
| download | rails-9e9793b440c044b765f2d1f702feeb92aef2b139.tar.gz rails-9e9793b440c044b765f2d1f702feeb92aef2b139.tar.bz2 rails-9e9793b440c044b765f2d1f702feeb92aef2b139.zip | |
do not trigger AR lazy load hook before initializers ran.
[Rafael Mendonça França & Yves Senn]
This require caused the `active_record.set_configs` initializer to
run immediately, before `config/initializers`. This means that setting any
configuration on `Rails.application.config.active_record` inside of
an initializer had no effects when rails was loaded through `rake`.
Introduced by #6518
/cc @rafaelfranca
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index a4ceacbf44..f1bdbc845c 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -36,8 +36,6 @@ module ActiveRecord config.eager_load_namespaces << ActiveRecord rake_tasks do - require "active_record/base" - namespace :db do task :load_config do ActiveRecord::Tasks::DatabaseTasks.database_configuration = Rails.application.config.database_configuration |