Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

New applications should use UTC as the default time zone

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9097 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 35d3ede97447d70aae8db716cd2448f116014d68 1 parent c366515
@dhh dhh authored
Showing with 11 additions and 11 deletions.
  1. +6 −6 railties/CHANGELOG
  2. +5 −5 railties/environments/environment.rb
View
12 railties/CHANGELOG
@@ -2,19 +2,19 @@
* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria, Sunny Ripert]
-* Added config.time_zone = 'UTC' as a commented-out option in the default environment.rb [Geoff Buesing]
+* Added config.time_zone = 'UTC' 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 rake tasks time:zones:all, time:zones:us and time:zones:local for finding time zone names for config.time_zone option [Geoff Buesing]
+
+* Add config.time_zone for configuring the default Time.zone value. #10982 [Geoff Buesing]
* Added support for installing plugins hosted at git repositories #11294 [danger]
* Fixed that script/generate would not look for plugin generators in plugin_paths #11000 [glv]
-* Fix database rake tasks to work with charset/collation and show proper error messages on failure. Closes #11301 [matt]
+* Fixed database rake tasks to work with charset/collation and show proper error messages on failure. Closes #11301 [matt]
-* add a -e/--export to script/plugin install, uses svn export. #10847 [jon@blankpad.net)]
-
-* Add config.time_zone for configuring the default Time.zone value. #10982 [Geoff Buesing]
+* Added a -e/--export to script/plugin install, uses svn export. #10847 [jon@blankpad.net)]
* Reshuffle load order so that routes and observers are initialized after plugins and app initializers. Closes #10980 [rick]
View
10 railties/environments/environment.rb
@@ -32,6 +32,11 @@
# (by default production uses :info, the others :debug)
# config.log_level = :debug
+ # 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 of tasks for finding time zone names. Uncomment to use default local time.
+ config.time_zone = 'UTC'
+
# Your secret key for verifying cookie session data integrity.
# If you change this key, all old sessions will become invalid!
# Make sure the secret is at least 30 characters and all random,
@@ -53,9 +58,4 @@
# Activate observers that should always be running
# config.active_record.observers = :cacher, :garbage_collector
-
- # 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 of tasks for finding time zone names.
- # config.time_zone = 'UTC'
end
Please sign in to comment.
Something went wrong with that request. Please try again.