aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-15 18:45:15 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-15 18:45:15 -0300
commit93e09f52781993f9f6b36af5b93e7d8892252271 (patch)
tree141dc9de75148f2d3a358a87e2524785e7a3e357 /activerecord/lib
parent2b2e04150680498f043720de34f82e6dc647c14a (diff)
parent41fb06fa47b0c11d6b943163ec1bc8ce9fd4d229 (diff)
downloadrails-93e09f52781993f9f6b36af5b93e7d8892252271.tar.gz
rails-93e09f52781993f9f6b36af5b93e7d8892252271.tar.bz2
rails-93e09f52781993f9f6b36af5b93e7d8892252271.zip
Merge pull request #16180 from rafaelfranca/rm-dirty
Improve Active Model Dirty API.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/attribute_methods/dirty.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index e1a86fd3aa..b58295a106 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -34,7 +34,7 @@ module ActiveRecord
# <tt>reload</tt> the record and clears changed attributes.
def reload(*)
super.tap do
- reset_changes
+ clear_changes_information
end
end
@@ -64,7 +64,7 @@ module ActiveRecord
store_original_raw_attributes
end
- def reset_changes
+ def clear_changes_information
super
original_raw_attributes.clear
end