aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-01-28 10:45:25 -0800
committerCarl Lerche <carllerche@mac.com>2010-01-28 10:45:25 -0800
commitf15bbcf97ee09d431e3ad347beb3fd31a411dda2 (patch)
tree99fb184b4fb317511ea032f35de1f5a7965b03a2 /railties/lib
parente7418ab63cc4aa024367851f2f692032840cfe76 (diff)
downloadrails-f15bbcf97ee09d431e3ad347beb3fd31a411dda2.tar.gz
rails-f15bbcf97ee09d431e3ad347beb3fd31a411dda2.tar.bz2
rails-f15bbcf97ee09d431e3ad347beb3fd31a411dda2.zip
Move the ActiveRecord generator settings into the Railtie
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators.rb7
1 files changed, 1 insertions, 6 deletions
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,