remove unneeded blank line from !namespeced? controller generators
Merge pull request #6587 from amatsuda/controller_generator_remove_blank_line_32

Backporting #6586 patch to 3-2-stable
Include routes.mounted_helpers into integration tests

In integration tests, you might want to use helpers from engines that
you mounted in your application. It's not hard to add it by yourself,
but it's unneeded boilerplate. mounted_helpers are now included by
default. That means that given engine mounted like:

    mount Foo::Engine => "/foo", :as => "foo"

you will be able to use paths from this engine in tests this way:

    foo.root_path #=> "/foo"

(closes #6573)
Add release date of 3.2.5 on the CHANGELOG
Use to_model delegates for polymorphic route generation
Merge pull request #6588 from nbibler/polymorphic_to_model

Correct the use of to_model in polymorphic routing
Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle adapter.
Because Oracle adapter supports only remove_column :table_name, :column_name syntax
and it has never supported remove_column :table_name, [:column_name].
Allow to use mounted helpers in ActionView::TestCase

Similarly to 6525002, this allows to use routes helpers for mounted
helpers, but this time in ActionView::TestCase
Merge pull request #6593 from yahonda/skip_test_remove_column_with_array_as_an_argument_is_deprecated

Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle
Add failing test for 3.2.5  datetime attribute regression
Fix #6591. If a field with timezone isn't changed, we don't call will_change!.
Merge pull request #6622 from kennyj/fix_6591-32

[3-2-stable back ported] Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes
Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option

This deprecation applies to:
`button_to`
`button_tag`
`image_submit_tag`
`link_to`
`submit_tag`

As :confirm is an UI specific option is better to use the data attributes,
teaching users about unobtrusive JavaScript and how Rails works with it.
Merge pull request #6613 from carlosgaldino/3-2-data-confirm

Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option
Add test to flash sweep after two redirects

This test is needed to avoid regressions in the way that flash works
now (swept in every request).
Revert "fix the Flash middleware loading the session on every request (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called"

This reverts commits e3069c64b2c5ddc7a5789b55b8efd4902d9e9729 and 2b2983d76fd11efc219273036a612f47cfaa5bfa.

Reason: This add a non-backward compatible change in the way that flash
works now (swept in every request).
Fix human attribute_name to handle deeply nested attributes

This is a back-port of b0e2fc84 to Rails 3.2.
See #5843 and #3859 also.
Merge pull request #6642 from kuroda/3-2-activemodel-translation-patch

Fix human attribute_name to handle deeply nested attributes
Revert "Perf: Don't load the association for #delete_all."

This reverts commit b98d1e21635d8776de8893cc09bd86c71f6c78f0.

Closes #6609

Conflicts:

	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
Make test cover previous reversion