repair a test broken by the number_to_currency XSS fix
Merge pull request #13162 from makandra/3-2-stable

Repair a test broken by the number_to_currency XSS fix
Fix documentation of number_to_currency helper

Now users have to explicit mark the unit as safe if they trust it.

Closes #13161
Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_option

Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix.

Conflicts:
	actionpack/CHANGELOG.md
Update Session Store Documentation

session_id doesn't need to be a text column, just string (VARCHAR)
Merge pull request #13315 from tyre/patch-1

Update Session Store Documentation
Fix force_ssl.rb documentation. Close tt tag.

[ci skip]
Merge pull request #13613 from simi/patch-1

Fix force_ssl.rb documentation. Close tt tag.
Escape format, negative_format and units options of number helpers

Previously the values of these options were trusted leading to
potential XSS vulnerabilities.

Fixes: CVE-2014-0081
Use the reference for the mime type to get the format

Before we were calling to_sym in the mime type, even when it is unknown
what can cause denial of service since symbols are not removed by the
garbage collector.

Fixes: CVE-2014-0082
Preparing for 3.2.17 release
Merge branch '3-2-17' into 3-2-stable

Conflicts:
	actionpack/CHANGELOG.md
Merge branch '3-2-stable' into causes-3-2-stable

This brings us up to version 3.2.17. We just have one commit in our
history still that doesn't exist upstream (0a46c8c509), and that commit
will be irrelevant once we get to Rails 4.0, so we can just ditch this
fork at that point.