diff options
author | José Valim <jose.valim@gmail.com> | 2011-05-06 08:35:57 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-05-06 08:35:57 -0700 |
commit | cae68d221cc81232e30049eafa4ff59b2c5f6010 (patch) | |
tree | ebff0feb10fe8a39a2a50b1be278e3e567576004 /railties/lib/rails/generators.rb | |
parent | 0e5adbceb7d49f3448eec32a7068807f571bf76c (diff) | |
parent | a8cfceca55b36129f87a512c7852901e416a1ee9 (diff) | |
download | rails-cae68d221cc81232e30049eafa4ff59b2c5f6010.tar.gz rails-cae68d221cc81232e30049eafa4ff59b2c5f6010.tar.bz2 rails-cae68d221cc81232e30049eafa4ff59b2c5f6010.zip |
Merge pull request #414 from asanghi/lh5796
config.generators.orm = false when skipping active record. LightHouse #5796
Diffstat (limited to 'railties/lib/rails/generators.rb')
-rw-r--r-- | railties/lib/rails/generators.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 9be395e989..85c67af19a 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -52,13 +52,13 @@ module Rails :integration_tool => nil, :javascripts => true, :javascript_engine => nil, - :orm => nil, + :orm => false, :performance_tool => nil, :resource_controller => :controller, :scaffold_controller => :scaffold_controller, :stylesheets => true, :stylesheet_engine => nil, - :test_framework => nil, + :test_framework => false, :template_engine => :erb }, |