aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/filter_parameter_logging.rb13
-rw-r--r--actionpack/lib/action_controller/metal/instrumentation.rb1
2 files changed, 0 insertions, 14 deletions
diff --git a/actionpack/lib/action_controller/metal/filter_parameter_logging.rb b/actionpack/lib/action_controller/metal/filter_parameter_logging.rb
deleted file mode 100644
index b59f6df244..0000000000
--- a/actionpack/lib/action_controller/metal/filter_parameter_logging.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module ActionController
- module FilterParameterLogging
- extend ActiveSupport::Concern
-
- module ClassMethods
- # This method has been moved to ActionDispatch::Http::ParametersFilter.filter_parameters
- def filter_parameter_logging(*filter_words, &block)
- ActiveSupport::Deprecation.warn("Setting filter_parameter_logging in ActionController is deprecated, please set 'config.filter_parameters' in application.rb or environments/[environment_name].rb instead.", caller)
- ActionDispatch::Http::ParametersFilter.filter_parameters(*filter_words, &block)
- end
- end
- end
-end
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index 0f22bf96cf..7f9a7c068b 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -10,7 +10,6 @@ module ActionController
extend ActiveSupport::Concern
include AbstractController::Logger
- include ActionController::FilterParameterLogging
attr_internal :view_runtime