aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2015-10-04 12:33:14 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2015-10-04 12:33:14 +0000
commit7976b6d3069d18aa4279921e15d90ef13197fd78 (patch)
treeeed9a5c51c002f0864a2148b172c5238989e2eaa /actionpack/lib/action_dispatch
parent67597e1719ec6af7e22964603cc77aa5b085a864 (diff)
parente889a226fe8985a3403fea3e2f90ca75b52b8f17 (diff)
downloadrails-7976b6d3069d18aa4279921e15d90ef13197fd78.tar.gz
rails-7976b6d3069d18aa4279921e15d90ef13197fd78.tar.bz2
rails-7976b6d3069d18aa4279921e15d90ef13197fd78.zip
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/http/filter_parameters.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb
index 9c0f39f2e7..9dcab79c3a 100644
--- a/actionpack/lib/action_dispatch/http/filter_parameters.rb
+++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb
@@ -30,12 +30,12 @@ module ActionDispatch
@filtered_path = nil
end
- # Return a hash of parameters with all sensitive data replaced.
+ # Returns a hash of parameters with all sensitive data replaced.
def filtered_parameters
@filtered_parameters ||= parameter_filter.filter(parameters)
end
- # Return a hash of request.env with all sensitive data replaced.
+ # Returns a hash of request.env with all sensitive data replaced.
def filtered_env
@filtered_env ||= env_filter.filter(@env)
end