1 files changed, 97 insertions, 11 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 3fc3e06160..058a69dcb6 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,90 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Ensure consistent fallback to the default layout lookup for layouts set
+    using symbols or procs that return nil.
+
+    All of the following layouts will result in the default layout lookup:
+
+        layout nil
+
+        layout proc { |c| nil }
+
+        layout :returns_nil
+
+        def returns_nil
+          nil
+        end
+
+    Previously symbols and procs which returned nil resulted in no layout which
+    differed from the `layout nil` behavior.
+
+    *Chris Nicola*
+
+*   Create `UpgradeLegacySignedCookieJar` to transparently upgrade existing signed
+    cookies generated by Rails 3.x to avoid invalidating them when upgrading to Rails 4.x.
+
+    *Trevor Turk + Neeraj Singh*
+
+*   Raise an `ArgumentError` when a clashing named route is defined.
+
+    *Trevor Turk*
+
+*   Allow default url options to accept host with protocol such as `http://`
+
+        config.action_mailer.default_url_options = { host: "http://mydomain.com" }
+
+    *Richard Schneeman*
+
+*   Ensure that digest authentication responds with a 401 status when a basic
+    header is received.
+
+    *Brad Dunbar*
+
+*   Include I18n locale fallbacks in view lookup.
+    Fixes GH#3512.
+
+    *Juan Barreneche*
+
+*   Integration and functional tests allow headers and rack env
+    variables to be passed when performing requests.
+    Fixes #6513.
+
+    Example:
+
+        # integration test
+        get "/success", {}, "HTTP_REFERER" => "http://test.com/",
+                            "Accepts" => "text/plain, text/html"
+
+        # functional test
+        @request.headers["Accepts"] = "text/plain, text/html"
+
+    *Yves Senn*
+
+*   Http::Headers respects headers that are not prefixed with HTTP_
+
+    *Yves Senn*
+
+*   Fix incorrectly appended square brackets to a multiple select box
+    if an explicit name has been given and it already ends with "[]"
+
+    Before:
+
+        select(:category, [], {}, multiple: true, name: "post[category][]")
+        # => <select name="post[category][][]" ...>
+
+    After:
+
+        select(:category, [], {}, multiple: true, name: "post[category][]")
+        # => <select name="post[category][]" ...>
+
+    *Olek Janiszewski*
+
+*   Fixed regression when using `assert_template` to verify files sent using
+    `render file: 'README.md'`.
+    Fixes #9464.
+
+    *Justin Coyne*
+
 *   Fixed `ActionView::Helpers::CaptureHelper#content_for` regression when trying to use it in
     a boolean statement.
     Fixes #9360.
@@ -39,6 +124,7 @@
 
     *Thierry Zires*
 
+
 ## Rails 4.0.0.beta1 (February 25, 2013) ##
 
 *   Fix `respond_to` not using formats that have no block if all is present. *Michael Grosser*
@@ -231,12 +317,12 @@
     Client-IP and Remote-Addr headers, in that order. Document the rationale
     for that decision, and describe the options that can be passed to the
     RemoteIp middleware to change it.
-    Fix #7979
+    Fixes #7979.
 
     *André Arko*, *Steve Klabnik*, *Alexey Gaziev*
 
 *   Do not append second slash to `root_url` when using `trailing_slash: true`
-    Fix #8700
+    Fixes #8700.
 
     Before:
 
@@ -264,7 +350,7 @@
 
 *   Do not append `charset=` parameter when `head` is called with a
     `:content_type` option.
-    Fix #8661.
+    Fixes #8661.
 
     *Yves Senn*
 
@@ -422,7 +508,7 @@
 
 *   Render every partial with a new `ActionView::PartialRenderer`. This resolves
     issues when rendering nested partials.
-    Fix #8197.
+    Fixes #8197.
 
     *Yves Senn*
 
@@ -430,7 +516,7 @@
     of mime types where template text is not html escaped by default. It prevents `Jack & Joe`
     from rendering as `Jack &amp; Joe` for the whitelisted mime types. The default whitelist
     contains `text/plain`.
-    Fix #7976.
+    Fixes #7976.
 
     *Joost Baaij*
 
@@ -446,7 +532,7 @@
         check_box("post", "comment_ids", { multiple: true, index: "foo" }, 1)
         # => <input name=\"post[foo][comment_ids][]\" type=\"hidden\" value=\"0\" /><input id=\"post_foo_comment_ids_1\" name=\"post[foo][comment_ids][]\" type=\"checkbox\" value=\"1\" />
 
-    Fix #8108.
+    Fixes #8108.
 
     *Daniel Fox, Grant Hutchins & Trace Wax*
 
@@ -469,7 +555,7 @@
     *Josh Peek*
 
 *   `assert_template` can be used to assert on the same template with different locals
-    Fix #3675.
+    Fixes #3675.
 
     *Yves Senn*
 
@@ -480,7 +566,7 @@
 *   Accept `:remote` as symbolic option for `link_to` helper. *Riley Lynch*
 
 *   Warn when the `:locals` option is passed to `assert_template` outside of a view test case
-    Fix #3415.
+    Fixes #3415.
 
     *Yves Senn*
 
@@ -504,12 +590,12 @@
 
 *   Rename internal variables on `ActionController::TemplateAssertions` to prevent
     naming collisions. `@partials`, `@templates` and `@layouts` are now prefixed with an underscore.
-    Fix #7459.
+    Fixes #7459.
 
     *Yves Senn*
 
 *   `resource` and `resources` don't modify the passed options hash.
-    Fix #7777.
+    Fixes #7777.
 
     *Yves Senn*
 
@@ -573,7 +659,7 @@
     *Guillermo Iguaran*
 
 *   Log now displays the correct status code when an exception is raised.
-    Fix #7646.
+    Fixes #7646.
 
     *Yves Senn*