bumping version to 3.2.10
Use Ruby 1.8 syntax
Merge tag 'v3.2.10' into 3-2-stable

Latest released tag was not fully merged into the stable branch (missed version bumping)
Merge pull request #8719 from pcasaretto/fix-actionview-doc-typo

Fix typo on form_tag_helper.rb [ci skip]
Merge pull request #8716 from miguelff/3-2-stable

Merged latest released tag (v3.2.10) into the stable branch (3-2-stable)
update directory tree in the generated README

[ci skip]
Merge pull request #8733 from amatsuda/rails32_readme_dir_tree

update directory tree in the generated README in Rails 3.2

[ci skip]
Fix undefined method `to_i' introduced since 3.2.8

This commit fixes a bug introduced in 96a13fc7 which breaks behaviour of
integer fields in 3.2.8.

In 3.2.8, setting the value of an integer field to a non-integer (eg.
Array, Hash, etc.) would default to 1 (true) :

    # 3.2.8
    p = Post.new
    p.category_id = [ 1, 2 ]
    p.category_id # => 1
    p.category_id = { 3 => 4 }
    p.category_id # => 1

In 3.2.9 and above, this will raise a NoMethodError :

    # 3.2.9
    p = Post.new
    p.category_id = [ 1, 2 ]

    NoMethodError: undefined method `to_i' for [1, 2]:Array

Whilst at first blush this appear to be sensible, it combines in bad
ways with scoping.

For example, it is common to use scopes to control access to data :

    @collection = Posts.where(:category_id => [ 1, 2 ])
    @new_post = @collection.new

In 3.2.8, this would work as expected, creating a new Post object
(albeit with @new_post.category_id = 1). However, in 3.2.9 this will
cause the NoMethodError to be raised as above.

It is difficult to avoid triggering this error without descoping before
calling .new, breaking any apps running on 3.2.8 that rely on this
behaviour.

This patch deviates from 3.2.8 in that it does not retain the somewhat
spurious behaviour of setting the attribute to 1. Instead, it explicitly
sets these invalid values to nil :

    p = Post.new
    p.category_id = [ 1, 2 ]
    p.category_id # => nil

This also fixes the situation where a scope using an array will
"pollute" any newly instantiated records.

    @new_post = @collection.new
    @new_post.category_id # => nil

Finally, 3.2.8 exhibited a behaviour where setting an object to an
integer field caused it to be coerced to "1". This has not been
retained, as it is spurious and surprising in the same way that setting
Arrays and Heshes was :

    c = Category.find(6)
    p = Post.new

    # 3.2.8
    p.category_id = c
    p.category_id # => 1

    # This patch
    p.category_id = c
    p.category_id # => nil

This commit includes explicit test cases that expose the original issue
with calling new on a scope that uses an Array. As this is a common
situation, an explicit test case is the best way to prevent regressions
in the future.

It also updates and separates existing tests to be explicit about the
situation that is being tested (eg. AR objects vs. other objects vs.
non-integers)
Merge pull request #8718 from jstirk/column_writer_to_i_errors

Fix undefined method `to_i' introduced since 3.2.8
Change the encrypted campfire notification token

Conflicts:
	.travis.yml
backport #4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused variables.

Conflicts:
	actionpack/test/controller/render_test.rb
Merge pull request #8763 from hsbt/backport-to-hide-warning

Backport 4f0f1b5 into 3-2-stable.

When running the test with warnings enabled, it fails without this change.
Remove suggestion that Procs can be used as session secrets.
(cherry picked from commit 6500d7994e94af439587ba0b6088b14532940ad2)

[ci skip]

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
Do not call fields_for from form_for, to avoid instantiating two builders

Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb
	actionpack/test/template/form_helper_test.rb
Fix error when assigning NaN to an integer column

Also covers any non-castable case by returning nil, which
is in-line with the intention of the former implementation,
but covers the odd cases which respond to to_i but raise
an error when it's called, such as NaN, Infinity and -Infinity.

Fixes #8757

Backport of #8781

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/column_test.rb
Remove warnings
Test only with Ruby 1.9+
connection_parameters is an Array and will never have
prepared_statements as value
Fix named scope + class method example

Closes #8804 [ci skip]

Conflicts:
	activerecord/lib/active_record/scoping/named.rb
Remove not used variable in eager test