aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/configuring.textile
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-13 16:19:41 -0700
committerJosé Valim <jose.valim@gmail.com>2012-03-13 16:19:41 -0700
commit795062282e072f289918688e978a0cf24e6d3aa5 (patch)
tree44c20ee7ce7b438052c6c6f48603c560954858ef /railties/guides/source/configuring.textile
parentc1f397f82c7b3f352500832a399b5dbdc500b9c8 (diff)
parentdde3058c3a7350d6e28d602a1f57fe908075bbe7 (diff)
downloadrails-795062282e072f289918688e978a0cf24e6d3aa5.tar.gz
rails-795062282e072f289918688e978a0cf24e6d3aa5.tar.bz2
rails-795062282e072f289918688e978a0cf24e6d3aa5.zip
Merge pull request #5261 from carlosantoniodasilva/identity-map-removal
Remove IdentityMap
Diffstat (limited to 'railties/guides/source/configuring.textile')
-rw-r--r--railties/guides/source/configuring.textile2
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index 49b15bd650..79980be5ef 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -288,8 +288,6 @@ h4. Configuring Active Record
* +config.active_record.whitelist_attributes+ will create an empty whitelist of attributes available for mass-assignment security for all models in your app.
-* +config.active_record.identity_map+ controls whether the identity map is enabled, and is false by default.
-
* +config.active_record.auto_explain_threshold_in_seconds+ configures the threshold for automatic EXPLAINs (+nil+ disables this feature). Queries exceeding the threshold get their query plan logged. Default is 0.5 in development mode.
* +config.active_record.dependent_restrict_raises+ will control the behavior when an object with a <tt>:dependent => :restrict</tt> association is deleted. Setting this to false will prevent +DeleteRestrictionError+ from being raised and instead will add an error on the model object. Defaults to false in the development mode.