aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/timestamp.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-08-03 02:15:12 +0200
committerXavier Noria <fxn@hashref.com>2010-08-03 02:15:12 +0200
commit4dc2521028140d005b0871ab5d8b02694dbf58c3 (patch)
treebeacf9a7b93180ce32e69f0491245aa64fbb1017 /activerecord/lib/active_record/timestamp.rb
parent88b5f938cf7d3eb26ad204451a4dbb9c2cf4f571 (diff)
parentdb0e3e5ad1db9bc0204db1dbc4075180bce3bc93 (diff)
downloadrails-4dc2521028140d005b0871ab5d8b02694dbf58c3.tar.gz
rails-4dc2521028140d005b0871ab5d8b02694dbf58c3.tar.bz2
rails-4dc2521028140d005b0871ab5d8b02694dbf58c3.zip
Merge remote branch 'docrails/master' into 3-0-stable
Diffstat (limited to 'activerecord/lib/active_record/timestamp.rb')
-rw-r--r--activerecord/lib/active_record/timestamp.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index 32b3f03f13..5531d12a41 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -21,7 +21,8 @@ module ActiveRecord
#
# 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:
+ # 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