1 files changed, 82 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index a7a4aabc98..d0662bdae2 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,83 @@
+*   Fix `NameError` raised in `ActionController::Renderer#with_defaults`
+
+    *Hiroyuki Ishii*
+
+*   Added `#reverse_merge` and `#reverse_merge!` methods to `ActionController::Parameters`
+
+    *Edouard Chin*, *Mitsutaka Mimura*
+
+*   Fix malformed URLS when using `ApplicationController.renderer`
+
+    The Rack environment variable `rack.url_scheme` was not being set so `scheme` was
+    returning `nil`. This caused URLs to be malformed with the default settings.
+    Fix this by setting `rack.url_scheme` when the environment is normalized.
+
+    Fixes #28151.
+
+    *George Vrettos*
+
+*   Commit flash changes when using a redirect route.
+
+    Fixes #27992.
+
+    *Andrew White*
+
+
+## Rails 5.1.0.beta1 (February 23, 2017) ##
+
+*   Prefer `remove_method` over `undef_method` when reloading routes
+
+    When `undef_method` is used it prevents access to other implementations of that
+    url helper in the ancestor chain so use `remove_method` instead to restore access.
+
+    *Andrew White*
+
+*   Add the `resolve` method to the routing DSL
+
+    This new method allows customization of the polymorphic mapping of models:
+
+    ``` ruby
+    resource :basket
+    resolve("Basket") { [:basket] }
+    ```
+
+    ``` erb
+    <%= form_for @basket do |form| %>
+    <!-- basket form -->
+    <% end %>
+    ```
+
+    This generates the correct singular URL for the form instead of the default
+    resources member url, e.g. `/basket` vs. `/basket/:id`.
+
+    Fixes #1769.
+
+    *Andrew White*
+
+*   Add the `direct` method to the routing DSL
+
+    This new method allows creation of custom url helpers, e.g:
+
+    ``` ruby
+    direct(:apple) { "http://www.apple.com" }
+
+    >> apple_url
+    => "http://www.apple.com"
+    ```
+
+    This has the advantage of being available everywhere url helpers are available
+    unlike custom url helpers defined in helper modules, etc.
+
+    *Andrew White*
+
+*   Add `ActionDispatch::SystemTestCase` to Action Pack
+
+    Adds Capybara integration directly into Rails through Action Pack!
+
+    See PR [#26703](https://github.com/rails/rails/pull/26703)
+
+    *Eileen M. Uchitelle*
+
 *   Remove deprecated `.to_prepare`, `.to_cleanup`, `.prepare!` and `.cleanup!` from `ActionDispatch::Reloader`.
 
     *Rafael Mendonça França*
@@ -35,7 +115,7 @@
 
     *Tawan Sierek*
 
-*   Fixes incorrect output from rails routes when using singular resources.
+*   Fixes incorrect output from `rails routes` when using singular resources.
 
     Fixes #26606.
 
@@ -253,7 +333,7 @@
         redirects to
         POST https://example.com/articles (i.e. ArticlesContoller#create)
 
-   *Chirag Singhal*
+    *Chirag Singhal*
 
 *   Add `:as` option to `ActionController:TestCase#process` and related methods.