aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index bdb14b69e5..050ec5e649 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,11 @@
+* Allow `config.action_dispatch.trusted_proxies` to accept an IPAddr object.
+
+ Example:
+ # config/environments/production.rb
+ config.action_dispatch.trusted_proxies = IPAddr.new('4.8.15.0/16')
+
+ *Sam Aarons*
+
* Avoid duplicating routes for HEAD requests.
Instead of duplicating the routes, we will first match the HEAD request to