aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2015-01-15 17:09:39 +0000
committerAbdelkader Boudih <terminale@gmail.com>2015-01-15 17:09:39 +0000
commit363e298c3cdfc4c3b569d4fe4053edc3b8943f0a (patch)
treef44a9ea723032dfc03a72d073c3e7dc12bfcdfd8 /activerecord
parent4c1f7c995ff45f6b483e8fe458b59a2c1335a888 (diff)
parent3818dd4efb0cdee7a0d9c6dc0a0dbaa2c02c7225 (diff)
downloadrails-363e298c3cdfc4c3b569d4fe4053edc3b8943f0a.tar.gz
rails-363e298c3cdfc4c3b569d4fe4053edc3b8943f0a.tar.bz2
rails-363e298c3cdfc4c3b569d4fe4053edc3b8943f0a.zip
Merge pull request #18539 from aditya-kapoor/correct-typo
[ci skip] fix typo sill -> still
Diffstat (limited to 'activerecord')
-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 e10024b2ec..98671178cb 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
- sill cause `String`s to be parsed as if they were in `Time.zone`,
+ still cause `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: