diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-21 04:22:59 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-21 04:22:59 -0800 |
| commit | a50382cacdfa2e30c882f9f462e982d78e3e8ef5 (patch) | |
| tree | 2cbe67d968fdd9a28330451b78b8b61a7484cac6 /activerecord/lib | |
| parent | c05f3b0e4f6c5b2b350828e5e3cf9d0b1146562f (diff) | |
| parent | bd603399639fe7dd12e532a89210760fa564440c (diff) | |
| download | rails-a50382cacdfa2e30c882f9f462e982d78e3e8ef5.tar.gz rails-a50382cacdfa2e30c882f9f462e982d78e3e8ef5.tar.bz2 rails-a50382cacdfa2e30c882f9f462e982d78e3e8ef5.zip | |
Merge pull request #4573 from amatsuda/ar_default_timezone_utc
change AR default_timezone to :utc since it's the default for AR::Railtie
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index e90503d173..adba3f710c 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -45,10 +45,10 @@ module ActiveRecord ## # :singleton-method: - # Determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling - # dates and times from the database. This is set to :local by default. + # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling + # dates and times from the database. This is set to :utc by default. config_attribute :default_timezone, :global => true - self.default_timezone = :local + self.default_timezone = :utc ## # :singleton-method: |