aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorAditya Sanghi <asanghi@me.com>2011-05-06 18:04:20 +0530
committerAditya Sanghi <asanghi@me.com>2011-05-06 18:04:20 +0530
commit75e1e2175d81b7047145768e72a0541b3266abed (patch)
treebdc57d6fec4c819b8b5a2972ff3ae24e62f94a1f /railties/lib/rails/generators
parentbe9857c21d9bf3e4c51a159b7d4edef69e203a57 (diff)
downloadrails-75e1e2175d81b7047145768e72a0541b3266abed.tar.gz
rails-75e1e2175d81b7047145768e72a0541b3266abed.tar.bz2
rails-75e1e2175d81b7047145768e72a0541b3266abed.zip
When skipping skip active record, mark config.generators.orm to false; LH 5796 remainder
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 3723addf2b..22d6d09baf 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -63,6 +63,8 @@ module <%= app_const_base %>
<% unless options[:skip_active_record] -%>
# Enable IdentityMap for Active Record, to disable set to false or remove the line below.
config.active_record.identity_map = true
+<% else -%>
+ config.generators.orm = false
<% end -%>
# Enable the asset pipeline