aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/railtie.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-09-30 10:30:58 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-30 10:30:58 +0200
commit1ba22bcde1d5ee1e16e14d4d2dd23cbeb01cd59f (patch)
tree0c74273f34c20e56975a6b7845a034fa3df8c469 /activerecord/lib/active_record/railtie.rb
parent69f97f469747777ed1c457715f5361f6b8a0ab7b (diff)
parent9f569c60adb3505cd7ca1723481199bf26619038 (diff)
downloadrails-1ba22bcde1d5ee1e16e14d4d2dd23cbeb01cd59f.tar.gz
rails-1ba22bcde1d5ee1e16e14d4d2dd23cbeb01cd59f.tar.bz2
rails-1ba22bcde1d5ee1e16e14d4d2dd23cbeb01cd59f.zip
Merge remote branch 'drogus/engines'
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
-rw-r--r--activerecord/lib/active_record/railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 94dda4e413..868fd6c3ff 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -13,7 +13,7 @@ module ActiveRecord
class Railtie < Rails::Railtie
config.active_record = ActiveSupport::OrderedOptions.new
- config.generators.orm :active_record, :migration => true,
+ config.app_generators.orm :active_record, :migration => true,
:timestamps => true
config.app_middleware.insert_after "::ActionDispatch::Callbacks",