aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-03-25 15:13:22 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-03-25 15:13:22 -0300
commit833109cc99053cf25787ace09a9978a55c079112 (patch)
tree5083aeb8ed9cc31078b23fb29dda1bbdfae78bdc /activerecord/lib
parente94e6c27af495a2460c811bb506459f1428dec6b (diff)
parentea3a73e720b5ffed6b6220dc9ce92776804cb06f (diff)
downloadrails-833109cc99053cf25787ace09a9978a55c079112.tar.gz
rails-833109cc99053cf25787ace09a9978a55c079112.tar.bz2
rails-833109cc99053cf25787ace09a9978a55c079112.zip
Merge pull request #14390 from huoxito/true-touch
Still touch associations when theres no timestamp
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/persistence.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index c20499d081..1a2581f579 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -455,6 +455,8 @@ module ActiveRecord
changed_attributes.except!(*changes.keys)
primary_key = self.class.primary_key
self.class.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
+ else
+ true
end
end