aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-01-19 09:22:17 +0100
committerYves Senn <yves.senn@gmail.com>2015-01-19 09:22:17 +0100
commitcf01d36f020f06992cb3d7e6d818137166a78fcb (patch)
tree26b5f33e302a3cc7b04d4fb5abbef377b0fd5475 /activerecord
parent1d01d47fe03ad312601c3ee45972a4bc8f870c2b (diff)
parent3faa2235414d5b2da10eda2fcb106cb6e4938b34 (diff)
downloadrails-cf01d36f020f06992cb3d7e6d818137166a78fcb.tar.gz
rails-cf01d36f020f06992cb3d7e6d818137166a78fcb.tar.bz2
rails-cf01d36f020f06992cb3d7e6d818137166a78fcb.zip
Merge pull request #18593 from prathamesh-sonpatki/ar-changelog
Fix wording in AR CHANGELOG about time columns change [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d8f29a77b4..1be5245e83 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -2,7 +2,7 @@
*Prathamesh Sonpatki*
-* `time` columns can now affected by `time_zone_aware_attributes`. If you have
+* `time` columns can now get affected by `time_zone_aware_attributes`. If you have
set `config.time_zone` to a value other than `'UTC'`, they will be treated
as in that time zone by default in Rails 5.1. If this is not the desired
behavior, you can set