Merge pull request #19666 from mikej/master

fix missing "if" in API docs for ActionController::Parameters#permit
This commit is contained in:
Santiago Pastorino 2015-04-06 10:47:48 -03:00
commit 2c16acde0d

@ -268,7 +268,7 @@ def require(key)
#
# 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+.