aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-03-16 21:35:37 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-03-16 21:35:37 +0900
commit41f8a9a03a495e0cdad93515b3b0ed25d494654c (patch)
tree1800c441cdbc52173a0221ff13a6c41ca731d468
parentb9c399de22aa84c94bb6b2edf6f8e88b88ac5f4a (diff)
downloadrails-41f8a9a03a495e0cdad93515b3b0ed25d494654c.tar.gz
rails-41f8a9a03a495e0cdad93515b3b0ed25d494654c.tar.bz2
rails-41f8a9a03a495e0cdad93515b3b0ed25d494654c.zip
Move new CHANGELOG entry to the top [ci skip]
-rw-r--r--activesupport/CHANGELOG.md14
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*