From 39a88f6f0eb1900d991ccde6fe59f56bfa4857ba Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Fri, 11 Jan 2013 09:26:48 -0200
Subject: Add changelog entry for scaffold generator and jbuilder changes

Introduced in 3bfd99defb559af0b017ee920ca714aa1e367fdd.
Related to #8840.

[ci skip]
---
 railties/CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e9a69e5a0c..ccb8a1fc8d 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Include `jbuilder` by default and rely on its scaffold generator to show json API.
+    Check https://github.com/rails/jbuilder for more info and examples.
+
+    *DHH*
+
+*   Scaffold now generates HTML-only controller by default.
+
+    *DHH + Pavel Pravosud*
+
 *   The generated `README.rdoc` for new applications invites the user to
     document the necessary steps to get the application up and running.
 
-- 
cgit v1.2.3