diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-04-06 10:47:48 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-04-06 10:47:48 -0300 |
| commit | 2c16acde0dd75e77d38b25b1254d4cffc14e81a6 (patch) | |
| tree | 925116f40d19427427b04c4e6e085f12417fe3f7 /actionpack | |
| parent | 188934cdac42491dffa63619cc0f9a5b25e0181f (diff) | |
| parent | e39f11f50aed472b3412c629c39dd025b3fbe8b2 (diff) | |
| download | rails-2c16acde0dd75e77d38b25b1254d4cffc14e81a6.tar.gz rails-2c16acde0dd75e77d38b25b1254d4cffc14e81a6.tar.bz2 rails-2c16acde0dd75e77d38b25b1254d4cffc14e81a6.zip | |
Merge pull request #19666 from mikej/master
fix missing "if" in API docs for ActionController::Parameters#permit
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index e30c9c5ade..c98e937423 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -268,7 +268,7 @@ module ActionController # # params.permit(:name) # - # +:name+ passes it is a key of +params+ whose associated value is of type + # +:name+ passes if it is a key of +params+ whose associated value is of type # +String+, +Symbol+, +NilClass+, +Numeric+, +TrueClass+, +FalseClass+, # +Date+, +Time+, +DateTime+, +StringIO+, +IO+, # +ActionDispatch::Http::UploadedFile+ or +Rack::Test::UploadedFile+. |