1 files changed, 55 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e9a69e5a0c..c6ffe30ad3 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,60 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Fixes database.yml when creating a new rails application with '.'
+    Fix #8304
+
+    *Jeremy W. Rowe*
+
+*   Deprecate the `eager_load_paths` configuration and alias it to `autoload_paths`.
+    Since the default in Rails 4.0 is to run in 'threadsafe' mode we need to eager
+    load all of the paths in `autoload_paths`. This may have unintended consequences
+    if you have added 'lib' to `autoload_paths` such as loading unneeded code or
+    code intended only for development and/or test environments. If this applies to
+    your application you should thoroughly check what is being eager loaded.
+
+    *Andrew White*
+
+*   Restore Rails::Engine::Railties#engines with deprecation to ensure
+    compatibility with gems such as Thinking Sphinx
+    Fix #8551
+
+    *Tim Raymond*
+
+*   Specify which logs to clear when using the `rake log:clear` task.
+    (e.g. rake log:clear LOGS=test,staging)
+
+    *Matt Bridges*
+
+*   Allow a `:dirs` key in the `SourceAnnotationExtractor.enumerate` options
+    to explicitly set the directories to be traversed so it's easier to define
+    custom rake tasks.
+
+    *Brian D. Burns*
+
+*   Deprecate `Rails::Generators::ActiveModel#update_attributes` in favor of `#update`.
+
+    ORMs that implement `Generators::ActiveModel#update_attributes` should change
+    to `#update`. Scaffold controller generators should change calls like:
+
+        @orm_instance.update_attributes(...)
+
+    to:
+
+        @orm_instance.update(...)
+
+    This goes along with the addition of `ActiveRecord::Base#update`.
+
+    *Carlos Antonio da Silva*
+
+*   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.