diff options
| author | Geoff Buesing <gbuesing@gmail.com> | 2008-03-22 02:23:09 +0000 |
|---|---|---|
| committer | Geoff Buesing <gbuesing@gmail.com> | 2008-03-22 02:23:09 +0000 |
| commit | 1ec8a7f4e0acd45d960512d2736d90473714ad48 (patch) | |
| tree | 4fef56bfc71ed14b1ddc3e6a90447a1fd91be2c8 /railties | |
| parent | 5c1be2812ddc81a3ac5b65c8a461a9622e41b31c (diff) | |
| download | rails-1ec8a7f4e0acd45d960512d2736d90473714ad48.tar.gz rails-1ec8a7f4e0acd45d960512d2736d90473714ad48.tar.bz2 rails-1ec8a7f4e0acd45d960512d2736d90473714ad48.zip | |
Added config.time_zone = 'UTC' as a commented-out option in the default environment.rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9076 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/environments/environment.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a22efda9be..bf5de6e025 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added config.time_zone = 'UTC' as a commented-out option in the default environment.rb [Geoff Buesing] + * Adding rake tasks time:zones:all, time:zones:us and time:zones:local for finding time zone names for config.time_zone option [Geoff Buesing] * Added support for installing plugins hosted at git repositories #11294 [danger] diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index b2f5b2b0a5..830d4f451d 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -54,6 +54,8 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector - # Make Active Record use UTC-base instead of local time - # config.active_record.default_timezone = :utc + # Make Time.zone default to the specified zone, and make ActiveRecord store time values + # in the database in UTC, and return them converted to the specified local zone. + # Run `rake -D time` for a list tasks for finding time zone names. + # config.time_zone = 'UTC' end
\ No newline at end of file |