Rack::Test::UploadedFile is a permitted scalar
remove assigned but unused variable warning
Merge pull request #9357 from fabiokr/rack_test_uploaded_file

Rack::Test::UploadedFile is a permitted scalar
Merge pull request #9354 from NARKOZ/remove-warnings

remove assigned but unused variables
Update railties/lib/rails/application/configuration.rb

Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"]
Update railties/lib/rails/application/configuration.rb

Better comment for database_configuration method
Merge pull request #9358 from iwiznia/patch-1

Update railties/lib/rails/application/configuration.rb
tweaks to the AP changelog [ci skip]
Remove not necessary changelog about time zone array mutation

This seemed to be introduced in master by
9dd64f2e0c1b3ce85b503b0f81c50c93f89ffbcd, so there's no need to add a
changelog entry for fixing it.

[ci skip]
Fix test name and refactor fake timezones creation in form options test
Use Array Difference to calculate the zones array, instead of iterating

It's faster, and doesn't force us to dup the timezones array.
Use #grep to filter priority zones when a regexp is given
Use composition to figure out the forgery protection strategy
This cache is not needed
Revert "Revert "Merge pull request #4803 from lucascaton/master""

This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.