diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/timestamp.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 97132e3fdb..611c3d703e 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make the record_timestamps class-inheritable so it can be set per model. #10004 [tmacedo] + * Allow validates_acceptance_of to use a real attribute instead of only virtual (so you can record that the acceptance occured) #7457 [ambethia] * DateTimes use Ruby's default calendar reform setting. #10201 [Geoff Buesing] diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index ee3e426512..84ae3785a2 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -12,7 +12,7 @@ module ActiveRecord base.alias_method_chain :create, :timestamps base.alias_method_chain :update, :timestamps - base.cattr_accessor :record_timestamps, :instance_writer => false + base.class_inheritable_accessor :record_timestamps, :instance_writer => false base.record_timestamps = true end |