diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-27 23:31:59 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-27 23:31:59 +0200 |
| commit | 67e79cf96d6bd27779a659703253984ac47a90ee (patch) | |
| tree | 310405fc0ecd0e567265e14ee3198070a8a72d10 /activerecord | |
| parent | 1793b21479d29ec29bd47c37ee68cb6ebdb71617 (diff) | |
| download | rails-67e79cf96d6bd27779a659703253984ac47a90ee.tar.gz rails-67e79cf96d6bd27779a659703253984ac47a90ee.tar.bz2 rails-67e79cf96d6bd27779a659703253984ac47a90ee.zip | |
Revert "Frameworks are loaded in application.rb rather than config.rb according to Rails 3 conventions."
This reverts commit 1793b21479d29ec29bd47c37ee68cb6ebdb71617.
This commit had no risk, but docrails has a hard rule about touching code.
The contribution is appreciated, I hope you do not mind this technical
revert. I'll apply that to master with proper credit.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index d61cc520b7..2c17c74ab4 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -333,7 +333,7 @@ namespace :db do if File.exists?(file) load(file) else - abort %{#{file} doesn't exist yet. Run "rake db:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded} + abort %{#{file} doesn't exist yet. Run "rake db:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/boot.rb to limit the frameworks that will be loaded} end end end |