From 424e961be776d9918f39660d43439fc1973f680e Mon Sep 17 00:00:00 2001
From: John Gesimondo <john@jmondo.com>
Date: Mon, 11 Jul 2016 20:48:56 -0700
Subject: Raise ArgumentError for bad strptime arguments

---
 activesupport/CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'activesupport/CHANGELOG.md')

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.
        
-- 
cgit v1.2.3