diff options
| author | Jon Moss <maclover7@users.noreply.github.com> | 2017-03-18 21:39:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-18 21:39:50 -0400 |
| commit | 9bcc02128613574ad96a96ccb9f953d4ee7509f9 (patch) | |
| tree | 951c9e0335649165c1328ed924be6bcd32bef740 | |
| parent | ed47cdb1a1ef0b25da62aafe49c47d633077175e (diff) | |
| parent | 41f8a9a03a495e0cdad93515b3b0ed25d494654c (diff) | |
| download | rails-9bcc02128613574ad96a96ccb9f953d4ee7509f9.tar.gz rails-9bcc02128613574ad96a96ccb9f953d4ee7509f9.tar.bz2 rails-9bcc02128613574ad96a96ccb9f953d4ee7509f9.zip | |
Merge pull request #28446 from y-yagi/move_new_changelog_entry_to_the_top
Move new CHANGELOG entry to the top [ci skip]
| -rw-r--r-- | activesupport/CHANGELOG.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 969d36c303..d12cbc34dd 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,10 @@ +* Fixed bug in `DateAndTime::Compatibility#to_time` that caused it to + raise `RuntimeError: can't modify frozen Time` when called on any frozen `Time`. + Properly pass through the frozen `Time` or `ActiveSupport::TimeWithZone` object + when calling `#to_time`. + + *Kevin McPhillips* & *Andrew White* + * Remove implicit coercion deprecation of durations In #28204 we deprecated implicit conversion of durations to a numeric which @@ -208,13 +215,6 @@ ## Rails 5.1.0.beta1 (February 23, 2017) ## -* Fixed bug in `DateAndTime::Compatibility#to_time` that caused it to - raise `RuntimeError: can't modify frozen Time` when called on any frozen `Time`. - Properly pass through the frozen `Time` or `ActiveSupport::TimeWithZone` object - when calling `#to_time`. - - *Kevin McPhillips* & *Andrew White* - * Cache `ActiveSupport::TimeWithZone#to_datetime` before freezing. *Adam Rice* |