diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-24 20:33:33 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-24 20:33:33 -0500 |
| commit | b306502286be1ea430a824edc2f1434bf4a86389 (patch) | |
| tree | 057fb2ecc0382f05aff1947dc8be559cfb19de2a /railties/guides/source/configuring.textile | |
| parent | 8d7efe6a4e25b8707d46006cf20f6ce499e83780 (diff) | |
| parent | bf40c729c6930ffc711760948701e5edf3edb25b (diff) | |
| download | rails-b306502286be1ea430a824edc2f1434bf4a86389.tar.gz rails-b306502286be1ea430a824edc2f1434bf4a86389.tar.bz2 rails-b306502286be1ea430a824edc2f1434bf4a86389.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/guides/source/configuring.textile')
| -rw-r--r-- | railties/guides/source/configuring.textile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile index 53460b8c36..d7069b31fc 100644 --- a/railties/guides/source/configuring.textile +++ b/railties/guides/source/configuring.textile @@ -229,6 +229,8 @@ h4. Configuring Active Record * +config.active_record.lock_optimistically+ controls whether ActiveRecord will use optimistic locking. By default this is +true+. +* +config.active_record.whitelist_attributes+ will create an empty whitelist of attributes available for mass-assignment security for all models in your app. + The MySQL adapter adds one additional configuration option: * +ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether ActiveRecord will consider all +tinyint(1)+ columns in a MySQL database to be booleans. By default this is +true+. |