diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 12 | ||||
| -rw-r--r-- | railties/environments/environment.rb | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 0bcf0cc3df..048ee103a3 100644 --- a/railties/CHANGELOG +++ b/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] diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index 41210f9913..7d70c0f01c 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -32,6 +32,11 @@ Rails::Initializer.run do |config| # (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 @@ Rails::Initializer.run do |config| # 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
\ No newline at end of file |