diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-27 16:10:17 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-27 18:18:45 -0300 |
| commit | dd3ea17191e316aeebddaa7b176f6cfeee7a6365 (patch) | |
| tree | 57fdbbafb1182664f4d2da8bb79e334b0a59bf9a /activerecord/lib/active_record/base.rb | |
| parent | 5cf456a076034a03f645d7465e1ebd683bc06907 (diff) | |
| download | rails-dd3ea17191e316aeebddaa7b176f6cfeee7a6365.tar.gz rails-dd3ea17191e316aeebddaa7b176f6cfeee7a6365.tar.bz2 rails-dd3ea17191e316aeebddaa7b176f6cfeee7a6365.zip | |
Merge pull request #14469 from tiegz/timestamp_inheritance_fix
Swap Timestamp/Callbacks order in ActiveRecord::Base
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 9ec1feea97..1d47cba234 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -310,8 +310,8 @@ module ActiveRecord #:nodoc: include Locking::Optimistic include Locking::Pessimistic include AttributeMethods - include Callbacks include Timestamp + include Callbacks include Associations include ActiveModel::SecurePassword include AutosaveAssociation |