From 2a946da9bbccfbd1e52b1164f4f4a77d5dbe3c10 Mon Sep 17 00:00:00 2001
From: Chris Arcand <chris@chrisarcand.com>
Date: Thu, 21 Jul 2016 16:10:42 -0500
Subject: Update changelog

---
 actionpack/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index d50cbaee38..12430ca965 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Fix 'defaults' option for root route
+
+    A regression from some refactoring for the 5.0 release, this change
+    fixes the use of 'defaults' (default parameters) in the 'root' routing method
+
+    *Chris Arcand*
+
 *   Check `request.path_parameters` encoding at the point they're set.
 
     Check for any non-UTF8 characters in path parameters at the point they're
-- 
cgit v1.2.3