diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-24 16:36:28 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-24 16:36:28 +0100 |
| commit | 7cb0812d212475c53b0175f832bb7ffe33de1749 (patch) | |
| tree | 1a5142c1c614d6d75701be0dfe218995d1a6b30c /config/environment.rb | |
| parent | 4c06098a7ba84dea6036784ce2279c9903af0f0e (diff) | |
| parent | b4ed63758425224440ed3b7782b1f5010995aaa8 (diff) | |
Merge remote-tracking branch 'openaustralia_github/add_timezone_support' into develop
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/environment.rb b/config/environment.rb index 3ce887c03..8611dd1b6 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -77,6 +77,9 @@ Rails::Initializer.run do |config| # Make Active Record use UTC-base instead of local time config.active_record.default_timezone = :utc + # This is the timezone that times and dates are displayed in + config.time_zone = Configuration::time_zone + config.after_initialize do require 'routing_filters.rb' end |