diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2014-01-22 13:44:11 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2014-01-22 13:44:11 -0800 |
| commit | 6ef0569b0bf6e13d63f6c51790745b2007b92973 (patch) | |
| tree | 7c46e5d8d4a89b89b494a237b8abdf512adb16f4 /activerecord/lib/active_record/timestamp.rb | |
| parent | 0d24946903853e09fce1824d28d3ad7b210b71b5 (diff) | |
| parent | 8cbd500035aa64a5440d5ccc44209cfd902118fc (diff) | |
| download | rails-6ef0569b0bf6e13d63f6c51790745b2007b92973.tar.gz rails-6ef0569b0bf6e13d63f6c51790745b2007b92973.tar.bz2 rails-6ef0569b0bf6e13d63f6c51790745b2007b92973.zip | |
Merge pull request #13799 from kbrock/better_dirty
Better ActiveRecord hierarchy for Dirty and others
Diffstat (limited to 'activerecord/lib/active_record/timestamp.rb')
| -rw-r--r-- | activerecord/lib/active_record/timestamp.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index e0541b7681..7178bed560 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -37,8 +37,8 @@ module ActiveRecord end def initialize_dup(other) # :nodoc: - clear_timestamp_attributes super + clear_timestamp_attributes end private @@ -71,7 +71,7 @@ module ActiveRecord end def should_record_timestamps? - self.record_timestamps && (!partial_writes? || changed? || (attributes.keys & self.class.serialized_attributes.keys).present?) + self.record_timestamps && (!partial_writes? || changed?) end def timestamp_attributes_for_create_in_model |