Merged r13037 from trunk to 2.4-stable

replace mail options reference URL at configuration.yml.example.

wiki.rubyonrails.org seems dead.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013039
Merged r13040 (#16467).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013045
Merged r13041 (#16511).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013047
Merged r13101 from trunk to 2.4-stable (#16711)

fix non-ascii attachment file name get corrupted in IE11.

Contributed by Go MAEDA.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013103
Merged r13110 and r13112 from trunk to 2.4-stable (#16685)

introduce request_store to ensure that the current user doesn't leak across request boundaries.

Contributed by Holger Just.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013114
Merged r13117 from trunk to 2.4-stable (#16685)

Gemfile: upgrade mocha version.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013119
2.4-stable: revert r13114 (#16685)

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013121
Merged r13130 from trunk to 2.4-stable

Gemfile: update Rails 3.2.18

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013134
Merged r13177 from trunk to 2.4-stable (#5706)

fix Ruby Logger doc link.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013179
Merged r13184 from trunk to 2.4-stable (#13932)

Fix file upload does not work with Safari.

Contributed by Felix Schäfer.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013189
Merged r13198 from trunk to 2.4-stable (#17235)

Prevent "can't modify frozen String" exception when mail sending error.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013202
Merged r13199 from trunk to 2.4-stable (#17151)

Fix file upload broken on Chrome 36.

Contributed by Felix Schäfer.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013203
Merged r13208 from trunk to 2.4-stable

Gemfile: update Rails 3.2.19

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013211
Merge .travis.yml related revisions from trunk to 2.4-stable

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013212
Backported r13190 (#17206).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013215
Merged r13213 (#16530).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013226
Updates for 2.4.6 release.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013229
tagged version 2.4.6

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4013230
Merge with bb 2.4.6 tagging revision

--HG--
branch : gh-bb-chili-mix-hg-git
Added tag bb-2.4.6 for changeset 20fbd8cb9dc4

--HG--
branch : gh-bb-chili-mix-hg-git