diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-06-16 22:52:48 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-06-16 22:52:48 -0700 |
| commit | ce13dc28e47d739545da5732a2b23903c9b7ed84 (patch) | |
| tree | 45151c3e105d55d9d6459c12118b45dd59bccb28 /activerecord/lib/active_record | |
| parent | 2d2f35ddf24bca89ef8c8e012bb230b721b40294 (diff) | |
| parent | 8867e16a6041e2139696bcb9cfab4642ce55fbdd (diff) | |
| download | rails-ce13dc28e47d739545da5732a2b23903c9b7ed84.tar.gz rails-ce13dc28e47d739545da5732a2b23903c9b7ed84.tar.bz2 rails-ce13dc28e47d739545da5732a2b23903c9b7ed84.zip | |
Merge pull request #10942 from yangchenyun/mine
correct documentation about active_record.default_timezone
Diffstat (limited to 'activerecord/lib/active_record')
| -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 ae99cff35e..9253150c4f 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -10,9 +10,9 @@ module ActiveRecord # # config.active_record.record_timestamps = false # - # Timestamps are in the local timezone by default but you can use UTC by setting: + # Timestamps are in UTC by default but you can use the local timezone by setting: # - # config.active_record.default_timezone = :utc + # config.active_record.default_timezone = :local # # == Time Zone aware attributes # |