aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-25 20:57:09 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-25 20:57:09 -0700
commit3dae4400989174c12730285397c58caf1a2685af (patch)
treeba635ff634a62c392c896203c032b277c28d5091
parent17a64de4980683da3ca3c185205013a29a8cf88d (diff)
parent9fa06c3d9811113259cb6e00a3a8454b3974add7 (diff)
downloadrails-3dae4400989174c12730285397c58caf1a2685af.tar.gz
rails-3dae4400989174c12730285397c58caf1a2685af.tar.bz2
rails-3dae4400989174c12730285397c58caf1a2685af.zip
Merge pull request #7164 from parndt/patch-4
Switched update_column recommendation in changelog to update_columns
-rw-r--r--activerecord/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 5cfdc9af14..c12520d6d8 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -17,7 +17,7 @@
*Steve Klabnik*
-* `update_attribute` has been deprecated. Use `update_column` if
+* `update_attribute` has been deprecated. Use `update_columns` if
you want to bypass mass-assignment protection, validations, callbacks,
and touching of updated_at. Otherwise please use `update_attributes`.