Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for 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
Don't break Haml with textarea newline fix.

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.
adding a branch to arel
Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml

Textarea newline fix breaks haml (3-2-stable)
Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml

Textarea newline fix breaks haml (3-2-stable)
Check if the options hash already exists and merge it with the another
hash.

Closes #2492 and #5614
Merge pull request #5622 from rafaelfranca/fix-2492-3-2

[3-2-stable] Fix label_tag to merge the options hash with the object hash
Add arel branch to the tests
Merge pull request #5624 from rafaelfranca/fix-build

Fix build
Merge pull request #5616 from cbartlett/migration-indent

Fix indenting in migration generator
Added config.action_view.embed_authenticity_token_in_remote_forms

There is a regression introduced in 16ee611fa, 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)
Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms

Embed auth token in remote forms
Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms

Embed auth token in remote forms
Test for #5549.

Cherry-picked from e96d04a2e4e244ea5053cb4e8ab97db604d0c796.

Conflicts:

	activerecord/lib/active_record/attribute_methods/read.rb
Fix #5549.
Cover one more case in auth_token and remote forms

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

If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.
Change the order argument from ('id') to ('taggings.id')
to address ORA-00918 error
Merge pull request #5640 from yahonda/address_ora_00918_with_oracle

Address an error for test_has_many_through_polymorphic_has_one with Oracle
Set proper rendered_format when doing render :inline

Closes #5632