diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-15 13:13:55 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-15 13:13:55 +0530 |
commit | 59b03d418ff59fe6bfba6a1b651ef0ac15a2738c (patch) | |
tree | 452b7f200c87ea8a7df1d2b651f1d4f0062e50f6 /actionpack/lib/action_dispatch/http | |
parent | 0be7fabd4eb77828e7deff7513faa3834d1a021a (diff) | |
parent | 7cd88840939cac913899fa9a11281d78388672ad (diff) | |
download | rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.tar.gz rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.tar.bz2 rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helper.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r-- | actionpack/lib/action_dispatch/http/filter_parameters.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb index 132b0c82bc..6413929be3 100644 --- a/actionpack/lib/action_dispatch/http/filter_parameters.rb +++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb @@ -10,8 +10,6 @@ module ActionDispatch # value of the params hash and all subhashes is passed to it, the value # or key can be replaced using String#replace or similar method. # - # Examples: - # # env["action_dispatch.parameter_filter"] = [:password] # => replaces the value to all keys matching /password/i with "[FILTERED]" # @@ -22,7 +20,6 @@ module ActionDispatch # v.reverse! if k =~ /secret/i # end # => reverses the value to all keys matching /secret/i - # module FilterParameters extend ActiveSupport::Concern |