diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-04-20 11:44:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 11:44:10 -0400 |
| commit | 248197370c8cc30adf1c2366aea58db6dfb3619b (patch) | |
| tree | c8b5bde8e05a3b5adac3657f26784102b9f1fe3a | |
| parent | 357559feea1e41afbe48f3c70215d9cd67f04021 (diff) | |
| parent | 71a006df0eaff580bf0badfb88197d531177e5e8 (diff) | |
| download | rails-248197370c8cc30adf1c2366aea58db6dfb3619b.tar.gz rails-248197370c8cc30adf1c2366aea58db6dfb3619b.tar.bz2 rails-248197370c8cc30adf1c2366aea58db6dfb3619b.zip | |
Merge pull request #32665 from albertoalmagro/fix-typos-filter-parameters
Fix typos related to ActionDispatch::Http::FilterParameters
| -rw-r--r-- | actionpack/lib/action_dispatch/http/filter_parameters.rb | 4 | ||||
| -rw-r--r-- | railties/test/application/configuration_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb index ec86b8bc47..ec012ad02d 100644 --- a/actionpack/lib/action_dispatch/http/filter_parameters.rb +++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb @@ -9,8 +9,8 @@ module ActionDispatch # sub-hashes of the params hash to filter. Filtering only certain sub-keys # from a hash is possible by using the dot notation: 'credit_card.number'. # If a block is given, each key and value of the params hash and all - # sub-hashes is passed to it, where the value or the key can be replaced using - # String#replace or similar method. + # sub-hashes are passed to it, where the value or the key can be replaced using + # String#replace or similar methods. # # env["action_dispatch.parameter_filter"] = [:password] # => replaces the value to all keys matching /password/i with "[FILTERED]" diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 59b43a7e10..84606d3b90 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -1417,7 +1417,7 @@ module ApplicationTests assert_equal "XML", last_response.body end - test "Rails.application#env_config exists and include some existing parameters" do + test "Rails.application#env_config exists and includes some existing parameters" do make_basic_app assert_equal app.env_config["action_dispatch.parameter_filter"], app.config.filter_parameters |