aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/environments/environment.rb6
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