aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/configuring.textile
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-11-26 19:14:39 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-11-26 19:14:39 +0530
commit1d8954068655580548e8e1cb283a8499988afb1d (patch)
tree2694ef0ad4ecf0297f6f72d4af84c90acb0494f9 /railties/guides/source/configuring.textile
parentb6916e0b925d4c8b4487d574fe07b11440f2ec5e (diff)
parent5c2a2ee76e2af591a997b71eec0e35143c07f9e1 (diff)
downloadrails-1d8954068655580548e8e1cb283a8499988afb1d.tar.gz
rails-1d8954068655580548e8e1cb283a8499988afb1d.tar.bz2
rails-1d8954068655580548e8e1cb283a8499988afb1d.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/guides/source/configuring.textile')
-rw-r--r--railties/guides/source/configuring.textile2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index cd6e7d116e..809948b41e 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -263,6 +263,8 @@ 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.
+
The MySQL adapter adds one additional configuration option:
* +ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether Active Record will consider all +tinyint(1)+ columns in a MySQL database to be booleans and is true by default.