1 files changed, 65 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 15833641bb..6a50565de5 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,64 @@
+*   Deprecate all *_filter callbacks in favor of *_action callbacks.
+
+    *Rafael Mendonça França*
+
+*   Fix URL generation with `:trailing_slash` such that it does not add
+    a trailing slash after `.:format`
+
+    *Dan Langevin*
+
+*   Build full URI as string when processing path in integration tests for
+    performance reasons.
+
+    *Guo Xiang Tan*
+
+*   Fix `'Stack level too deep'` when rendering `head :ok` in an action method
+    called 'status' in a controller.
+
+    Fixes #13905.
+
+    *Christiaan Van den Poel*
+
+*   Add MKCALENDAR HTTP method (RFC 4791).
+
+    *Sergey Karpesh*
+
+*   Instrument fragment cache metrics.
+
+    Adds `:controller`: and `:action` keys to the instrumentation payload
+    for the `*_fragment.action_controller` notifications. This allows tracking
+    e.g. the fragment cache hit rates for each controller action.
+
+    *Daniel Schierbeck*
+
+*   Always use the provided port if the protocol is relative.
+
+    Fixes #15043.
+
+    *Guilherme Cavalcanti*, *Andrew White*
+
+*   Moved `params[request_forgery_protection_token]` into its own method
+    and improved tests.
+
+    Fixes #11316.
+
+    *Tom Kadwill*
+
+*   Added verification of route constraints given as a Proc or an object responding
+    to `:matches?`. Previously, when given an non-complying object, it would just
+    silently fail to enforce the constraint. It will now raise an `ArgumentError`
+    when setting up the routes.
+
+    *Xavier Defrang*
+
+*   Properly treat the entire IPv6 User Local Address space as private for
+    purposes of remote IP detection. Also handle uppercase private IPv6
+    addresses.
+
+    Fixes #12638.
+
+    *Caleb Spare*
+
 *   Fixed an issue with migrating legacy json cookies.
 
     Previously, the `VerifyAndUpgradeLegacySignedMessage` assumes all incoming
@@ -19,7 +80,7 @@
     4. Use `escape_segment` rather than `escape_path` in URL generation
 
     For point 4 there are two exceptions. Firstly, when a route uses wildcard segments
-    (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This
+    (e.g. `*foo`) then we use `escape_path` as the value may contain '/' characters. This
     means that wildcard routes can't be optimized. Secondly, if a `:controller` segment
     is used in the path then this uses `escape_path` as the controller may be namespaced.
 
@@ -49,12 +110,12 @@
 
     *Andrew White*, *James Coglan*
 
-*   Append link to bad code to backtrace when exception is SyntaxError.
+*   Append link to bad code to backtrace when exception is `SyntaxError`.
 
     *Boris Kuznetsov*
 
 *   Swapped the parameters of assert_equal in `assert_select` so that the
-    proper values were printed correctly
+    proper values were printed correctly.
 
     Fixes #14422.
 
@@ -79,4 +140,5 @@
 
     *Tony Wooster*
 
+
 Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/actionpack/CHANGELOG.md) for previous changes.