aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/persistence.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-23 10:59:05 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-23 10:59:05 -0300
commit9aa1a3d85327fa0a3055b5b757a0be092ce582f7 (patch)
tree963c86f32493da238498a52798c0c6018addd144 /activerecord/lib/active_record/persistence.rb
parent782055674a975e54846bcc103eac023ac84b046b (diff)
downloadrails-9aa1a3d85327fa0a3055b5b757a0be092ce582f7.tar.gz
rails-9aa1a3d85327fa0a3055b5b757a0be092ce582f7.tar.bz2
rails-9aa1a3d85327fa0a3055b5b757a0be092ce582f7.zip
Merge pull request #10816 from bogdan/less-dirty-dirty
Make AM::Dirty less dirty to plugin into AR or other library
Diffstat (limited to 'activerecord/lib/active_record/persistence.rb')
-rw-r--r--activerecord/lib/active_record/persistence.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index d630f31f5f..bdd00ee259 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -434,7 +434,7 @@ module ActiveRecord
changes[self.class.locking_column] = increment_lock if locking_enabled?
- @changed_attributes.except!(*changes.keys)
+ changed_attributes.except!(*changes.keys)
primary_key = self.class.primary_key
self.class.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
end