diff options
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 13 | ||||
| -rw-r--r-- | activerecord/lib/active_record/timestamp.rb | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 99043af1a5..5898ec3732 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -220,19 +220,6 @@ module ActiveRecord #:nodoc: # user = User.create(:preferences => %w( one two three )) # User.find(user.id).preferences # raises SerializationTypeMismatch # - # == Time Zone aware attributes - # - # By default, ActiveRecord::Base keeps all the datetime columns time zone aware by executing following code. - # - # ActiveRecord::Base.time_zone_aware_attributes = true - # - # This feature can easily be turned off by assigning value <tt>false</tt> . - # - # If your attributes are time zone aware and you desire to skip time zone conversion for certain attributes then you can do following: - # - # Topic.skip_time_zone_conversion_for_attributes = [:written_on] - # - # # == Single table inheritance # # Active Record allows inheritance by storing the name of the class in a column that by default is named "type" (can be changed diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index 6c1e376745..92f7a7753d 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -12,6 +12,18 @@ module ActiveRecord # Timestamps are in the local timezone by default but you can use UTC by setting: # # <tt>ActiveRecord::Base.default_timezone = :utc</tt> + # + # == Time Zone aware attributes + # + # By default, ActiveRecord::Base keeps all the datetime columns time zone aware by executing following code. + # + # ActiveRecord::Base.time_zone_aware_attributes = true + # + # This feature can easily be turned off by assigning value <tt>false</tt> . + # + # If your attributes are time zone aware and you desire to skip time zone conversion for certain attributes then you can do following: + # + # Topic.skip_time_zone_conversion_for_attributes = [:written_on] module Timestamp extend ActiveSupport::Concern |