aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorFabio Kreusch <fabiokr@gmail.com>2013-02-21 11:00:26 -0300
committerFabio Kreusch <fabiokr@gmail.com>2013-02-21 11:00:26 -0300
commitfa9ec0a678e347f96e613f937323b9f969160f35 (patch)
treec2d29e25aeace80a0a909aa73851200a1fc98a6c /actionpack/lib/action_controller/metal
parentb0fa9b59c8c9cac52d4eb4d8d984b85d4a753e97 (diff)
downloadrails-fa9ec0a678e347f96e613f937323b9f969160f35.tar.gz
rails-fa9ec0a678e347f96e613f937323b9f969160f35.tar.bz2
rails-fa9ec0a678e347f96e613f937323b9f969160f35.zip
Rack::Test::UploadedFile is a permitted scalar
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index 7e720ca6f5..e4dcd3213f 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -191,9 +191,9 @@ module ActionController
#
# +:name+ passes it is a key of +params+ whose associated value is of type
# +String+, +Symbol+, +NilClass+, +Numeric+, +TrueClass+, +FalseClass+,
- # +Date+, +Time+, +DateTime+, +StringIO+, +IO+, or
- # +ActionDispatch::Http::UploadedFile+. Otherwise, the key +:name+ is
- # filtered out.
+ # +Date+, +Time+, +DateTime+, +StringIO+, +IO+,
+ # +ActionDispatch::Http::UploadedFile+ or +Rack::Test::UploadedFile+.
+ # Otherwise, the key +:name+ is filtered out.
#
# You may declare that the parameter should be an array of permitted scalars
# by mapping it to an empty array:
@@ -374,6 +374,7 @@ module ActionController
StringIO,
IO,
ActionDispatch::Http::UploadedFile,
+ Rack::Test::UploadedFile,
]
def permitted_scalar?(value)