aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-27 20:19:29 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-27 20:19:29 -0200
commitd66ffb656e0cfbb4216f030c8e0669509567e362 (patch)
tree4a12866dee49d781a63163b115bf4b51914d5b86 /activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
parent3a551b9777e7bb16caa3bba63c2412d450126f5f (diff)
parent31dd1ca59f13f37c46027e5006324d2060395765 (diff)
downloadrails-d66ffb656e0cfbb4216f030c8e0669509567e362.tar.gz
rails-d66ffb656e0cfbb4216f030c8e0669509567e362.tar.bz2
rails-d66ffb656e0cfbb4216f030c8e0669509567e362.zip
Merge pull request #18588 from thegcat/patch-1
[ci skip] fix typo still -> will
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb')
-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 98671178cb..75cc88d4ee 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -73,7 +73,7 @@ module ActiveRecord
time_zone_aware_types.include?(:not_explicitly_configured)
ActiveSupport::Deprecation.warn(<<-MESSAGE)
Time columns will become time zone aware in Rails 5.1. This
- still cause `String`s to be parsed as if they were in `Time.zone`,
+ still causes `String`s to be parsed as if they were in `Time.zone`,
and `Time`s to be converted to `Time.zone`.
To keep the old behavior, you must add the following to your initializer: