aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-03-24 12:47:06 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-03-24 12:47:06 -0300
commit2e8a350c38715787ab79603bf1e4b6296e23d80b (patch)
treecd672470c8ea7d6cfb9eb555fa0f0febcbed6365 /activerecord/lib
parent0741cf9cbc88105dbb2017ae42ddfa2e0793adfc (diff)
parent05244fa7d79fb84a1a6e3f6948ad389157fb64e1 (diff)
downloadrails-2e8a350c38715787ab79603bf1e4b6296e23d80b.tar.gz
rails-2e8a350c38715787ab79603bf1e4b6296e23d80b.tar.bz2
rails-2e8a350c38715787ab79603bf1e4b6296e23d80b.zip
Merge pull request #24303 from gsamokovarov/fix-timezone-deprication-warning
Fix a tip in Active Record time attributes deprecation
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
index ebaaa54b2b..e160460286 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -104,7 +104,7 @@ module ActiveRecord
To silence this deprecation warning, add the following:
- config.active_record.time_zone_aware_types << :time
+ config.active_record.time_zone_aware_types = [:datetime, :time]
MESSAGE
end