aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-01 20:40:03 +0200
committerXavier Noria <fxn@hashref.com>2012-08-01 20:40:07 +0200
commit81542f95d25825a7d3eff87d6f706661bf553b18 (patch)
treea68238beb530b68b5cbeff4d860a32d440097bfc /activerecord
parentf203be98645a603e03aa0dbbf2b7eb42cd729cb4 (diff)
downloadrails-81542f95d25825a7d3eff87d6f706661bf553b18.tar.gz
rails-81542f95d25825a7d3eff87d6f706661bf553b18.tar.bz2
rails-81542f95d25825a7d3eff87d6f706661bf553b18.zip
removes the deprecation of update_attribute
Applying the new policy here to not deprecate stuff in point releases.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/persistence.rb1
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index aa2b9685d0..d7bda6470e 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,7 @@
## Rails 3.2.8 ##
+* Removes the deprecation of `update_attribute`. *fxn*
+
* Reverted the deprecation of `*_sql` association options. They will
be deprecated in 4.0 instead.
@@ -11,8 +13,6 @@
*Rafael Mendonça França*
-* Change the deprecation warning of `update_attribute` suggesting to use `update_attributes` or `update_columns` instead of `update_column`. *Philip Arndt & Xavier Noria*
-
* update_columns added. *Sebastián Martínez*
## Rails 3.2.7 (Jul 26, 2012) ##
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 3926d6ee10..d6249db380 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -179,7 +179,6 @@ module ActiveRecord
#
def update_attribute(name, value)
name = name.to_s
- ActiveSupport::Deprecation.warn("update_attribute is deprecated and will be removed in Rails 4.1. Please use update_attributes or update_columns instead. Check their documentation for the implications.")
raise ActiveRecordError, "#{name} is marked as readonly" if self.class.readonly_attributes.include?(name)
send("#{name}=", value)
save(:validate => false)