aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-10 00:48:31 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-10 00:49:36 +0200
commit0e1dcae1857db4f6721561caff38d8be748d0b40 (patch)
tree2905647ca82a315211a4eb54329aee7a0b6dde90
parent73ff6797ef3e6fd0a3ee4b860061cf6869fe835d (diff)
downloadrails-0e1dcae1857db4f6721561caff38d8be748d0b40.tar.gz
rails-0e1dcae1857db4f6721561caff38d8be748d0b40.tar.bz2
rails-0e1dcae1857db4f6721561caff38d8be748d0b40.zip
Disable identity map by default. Detailed documentation will be pushed later.
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb5
1 files changed, 0 insertions, 5 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 e1946807b0..8ff80c6fd3 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -56,11 +56,6 @@ module <%= app_const_base %>
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
-<% 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
-<% end -%>
-
# Enable the asset pipeline
config.assets.enabled = true
end