From 3e2552db899160266f175f2fda61e44be258aecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= <rafael@franca.dev>
Date: Tue, 5 May 2020 01:18:38 -0400
Subject: [PATCH] Remove deprecated `ActionDispatch::Http::ParameterFilter`

---
 actionpack/CHANGELOG.md                              |  4 ++++
 actionpack/lib/action_dispatch.rb                    |  1 -
 .../lib/action_dispatch/http/parameter_filter.rb     | 12 ------------
 actionpack/test/dispatch/request_test.rb             |  6 ------
 guides/source/6_1_release_notes.md                   |  2 ++
 5 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 actionpack/lib/action_dispatch/http/parameter_filter.rb

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 52dd5e8e98..5d88d1810e 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated `ActionDispatch::Http::ParameterFilter`.
+
+    *Rafael Mendonça França*
+
 *   Added support for exclusive no-store Cache-Control header.
 
     If `no-store` is set on Cache-Control header it is exclusive (all other cache directives are dropped).
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index ba4b62fb97..7eea9c13a0 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -83,7 +83,6 @@ module ActionDispatch
     autoload :Headers
     autoload :MimeNegotiation
     autoload :Parameters
-    autoload :ParameterFilter
     autoload :UploadedFile, "action_dispatch/http/upload"
     autoload :URL
   end
diff --git a/actionpack/lib/action_dispatch/http/parameter_filter.rb b/actionpack/lib/action_dispatch/http/parameter_filter.rb
deleted file mode 100644
index ddeb3d81e2..0000000000
--- a/actionpack/lib/action_dispatch/http/parameter_filter.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/deprecation/constant_accessor"
-require "active_support/parameter_filter"
-
-module ActionDispatch
-  module Http
-    include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-    deprecate_constant "ParameterFilter", "ActiveSupport::ParameterFilter",
-      message: "ActionDispatch::Http::ParameterFilter is deprecated and will be removed from Rails 6.1. Use ActiveSupport::ParameterFilter instead."
-  end
-end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 47d615c522..a580a53d6f 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -1116,12 +1116,6 @@ class RequestParameters < BaseRequestTest
 end
 
 class RequestParameterFilter < BaseRequestTest
-  test "parameter filter is deprecated" do
-    assert_deprecated do
-      ActionDispatch::Http::ParameterFilter.new(["blah"])
-    end
-  end
-
   test "filtered_parameters returns params filtered" do
     request = stub_request(
       "action_dispatch.request.parameters" => {
diff --git a/guides/source/6_1_release_notes.md b/guides/source/6_1_release_notes.md
index 496a2ab808..cca4b335d1 100644
--- a/guides/source/6_1_release_notes.md
+++ b/guides/source/6_1_release_notes.md
@@ -55,6 +55,8 @@ Please refer to the [Changelog][action-pack] for detailed changes.
 
 ### Removals
 
+*   Remove deprecated `ActionDispatch::Http::ParameterFilter`.
+
 *   Remove deprecated `force_ssl` at the controller level.
 
 ### Deprecations