aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-12 03:07:22 -0300
committerGitHub <noreply@github.com>2016-07-12 03:07:22 -0300
commit2afd5e78b842a84e401a030bc747bf60879863e2 (patch)
tree4447425d796bd6223f3df4f334c86b3b77a099c5 /activesupport/CHANGELOG.md
parent108a407b7d41ba47317cf448dbb5e032ba1b039f (diff)
parent424e961be776d9918f39660d43439fc1973f680e (diff)
downloadrails-2afd5e78b842a84e401a030bc747bf60879863e2.tar.gz
rails-2afd5e78b842a84e401a030bc747bf60879863e2.tar.bz2
rails-2afd5e78b842a84e401a030bc747bf60879863e2.zip
Merge pull request #25793 from jmondo/strptime
Raise ArgumentError for bad strptime arguments
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 1c6f340fba..a8d875640e 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,12 @@
+* Fix `ActiveSupport::TimeZone#strptime`. Now raises `ArgumentError` when the
+ given time doesn't match the format. The error is the same as the one given
+ by Ruby's `Date.strptime`. Previously it raised
+ `NoMethodError: undefined method empty? for nil:NilClass.` due to a bug.
+
+ Fixes #25701.
+
+ *John Gesimondo*
+
* `travel/travel_to` travel time helpers, now raise on nested calls,
as this can lead to confusing time stubbing.