From de29c3088b624d6a5109e073ef76079d84028abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 17 May 2012 20:21:01 +0300
Subject: [PATCH] Update actionpack/CHANGELOG.md

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

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 432e90199a..8df943139e 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Templates without a handler extension now raises a deprecation warning but still
+    defaults to ERb. In future releases, it will simply return the template contents. *Steve Klabnik*
+
 *   Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_tag`, `button_tag` and `button_to` helpers.
 
     *Carlos Galdino + Rafael Mendonça França*