[3-2-stable] Do not use the attributes hash in the scaffold functional tests

…Base::ConnectionSpecification objects.

[3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.

…dition variables' in mutex ConditionVariables

…model

ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables

…ajax forms use the meta-tag value

…te forms if you pass true

This method has no effect since exception handling was
moved to middlewares and ActionController tests do not
use any middlewares.

3 2 static invalid byte sequence

Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.

Strip null bytes from Location header

Fix typo in redirect test

This fixes situation where rendering template to string
sets `rendered_format` to the format rendered there.
This is ok to have consistent formats rendered in partials,
but it breaks on next renders if format is explicitly set
or on last render where default format does not necessarily
need to be the format of first rendered template.

Fix for #5440

…form only

[3-2-stable] Fix GH #5435. db:structure:dump should be re-enable.

…2-stable

Build fix app generator test 3 2 stable

  Second security vulnerability found in mail file delivery method
  patched in version 2.4.4.

Build fix 1.8.7 3 2 stable

…he rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)

[3-2-stable] Remove blank line from generated migration

…nerating migration'

Port of #5522 'Fix adding/removing field's index when generating migration'

Fix GH #5411. When precompiling, params method is undefined.

Also skip persistente tests related to UPDATE + ORDER BY for postgresql

PostgreSQL does not support updates with order by, and these tests are
failing randomly depending on the fixture loading order now.

Fix build for branch 3-2-stable

Fix build for branch 3-2-stable - Part 2

[3-2-stable] migrate(:down) method with table_name_prefix

fixes #5521

Make sure to return the same hash object instead of returning a new one.
Returning a new one causes failures on cookie store tests, where it
tests for the 'Set-Cookie' header with the session signature.

This is due to the hash ordering changes on Ruby 1.8.7-p358.

apply form_for namespace option to date_select

Fix build for branch 3-2-stable - return the same session hash object

Issue with schema dump

Previously `rendered_format` was set only based on mime types
passed in Accept header, which was wrong if first type from
Accept was different than rendered partial. The fix is to simply
move setting rendered_format to the place where template
is available and grab format from the template. If it fails
we can fallback to formats passed by Accept header.

…artial

Fix rendered format for render partial

…r label.

objectify_options method should be applied to the proper options arg.

See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example

backport ddb5d2f to 3-2-stable

force datetime attributes to be changed

See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)

Also fix 6 more tests that didn't yet have the newline expectation.

Textarea newline fix breaks haml (3-2-stable)

Textarea newline fix breaks haml (3-2-stable)

hash.

Closes #2492 and #5614

[3-2-stable] Fix label_tag to merge the options hash with the object hash

Fix build

Fix indenting in migration generator

There is a regression introduced in 16ee611, which breaks
remote forms that should also work without javascript. This commit
introduces config option that allows to configure this behavior
defaulting to the old behavior (ie. include authenticity token
in remote forms by default)

Embed auth token in remote forms

Embed auth token in remote forms

Cherry-picked from e96d04a.

Conflicts:

	activerecord/lib/active_record/attribute_methods/read.rb

If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.

If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.

to address ORA-00918 error

Address an error for test_has_many_through_polymorphic_has_one with Oracle

Closes #5632

Closes #5632

…uction config template.

Changed the config.assets.manifest to nil

…kip]

…kip]

…or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.

…add, so it's more readable

…make the code harder to read. Minor changes to contain_all_columns in IdentityMap.

Conflicts:

	activerecord/lib/active_record/base.rb

Conflicts:

	activerecord/test/cases/associations/eager_test.rb

…_select

Fixing Identity Map when using find select in rails 3.2

Closes #5677

In case `source_roout` is not set, `default_source_root` is used,
which includes also `templates` directory. If there is no `templates`
directory, `default_source_root` is not available and USAGE will not
be displayed. USAGE should be also checked based on default
directory excluding `templates`.

ActiveRecord configuration logging

logger.silence is deprecated