aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-09 17:25:20 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-09 17:27:32 -0300
commitdddbccb25a709e1897326e2a25d37da83bbfd717 (patch)
tree6244e959061c596914dc8505468e48b296e63c40 /activerecord/lib/active_record/base.rb
parent9664661f7b8e916ab2cf3fee1b2d2d2f0b26ceeb (diff)
downloadrails-dddbccb25a709e1897326e2a25d37da83bbfd717.tar.gz
rails-dddbccb25a709e1897326e2a25d37da83bbfd717.tar.bz2
rails-dddbccb25a709e1897326e2a25d37da83bbfd717.zip
Timestamp values should be present on callbacks
This reverts commit dd3ea17191e316aeebddaa7b176f6cfeee7a6365 and add a regression test. Fixes #15418
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index e8c067f758..e4d0abb8ef 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -311,8 +311,8 @@ module ActiveRecord #:nodoc:
include Locking::Optimistic
include Locking::Pessimistic
include AttributeMethods
- include Timestamp
include Callbacks
+ include Timestamp
include Associations
include ActiveModel::SecurePassword
include AutosaveAssociation