From f15bbcf97ee09d431e3ad347beb3fd31a411dda2 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 28 Jan 2010 10:45:25 -0800
Subject: Move the ActiveRecord generator settings into the Railtie

---
 railties/lib/rails/generators.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 41dec3a120..1271de7af9 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -38,11 +38,6 @@ module Rails
     }
 
     DEFAULT_OPTIONS = {
-      :active_record => {
-        :migration  => true,
-        :timestamps => true
-      },
-
       :erb => {
         :layout => true
       },
@@ -51,7 +46,7 @@ module Rails
         :force_plural => false,
         :helper => true,
         :layout => true,
-        :orm => :active_record,
+        :orm => nil,
         :integration_tool => nil,
         :performance_tool => nil,
         :resource_controller => :controller,
-- 
cgit v1.2.3