Fix decorating columns for serialized attributes
The return value from mailer methods is not relevant.
Merge pull request #8441 from itzki/fix_decorate_columns

Fix decorate_columns for finding only non-serialized columns
Merge pull request #8450 from senny/8448_mailer_return_values

the return value of mailer methods should not be relevant
Prevent raising EOFError on multipart GET request.

Such request can happen on Internet Explorer. When we redirect
after multipart form submission, the request type is changed
to GET, but Content-Type is preserved as multipart. GET request
cannot have multipart body and that caused Rails to fail.

It's similar fix to Rack's one:
https://github.com/chneukirchen/rack/blob/8025a4ae9477d1e6231344c2b7d795aa9b3717b6/lib/rack/request.rb#L224
Merge pull request #8476 from sheerun/fix/multipart-get

Prevent raising EOFError on multipart GET request.
Move new CHANGELOG entry to the top
Added regression test for #8195.
Make sure the tests pass in the case closer to described in #8195

Conflicts:
	activerecord/test/models/bulb.rb
	activerecord/test/schema/schema.rb
Allow users to choose the timestamp format in the cache key

This can be done using the class attribute cache_timestamp_format

Conflicts:
	railties/guides/source/configuring.textile
Add CHANGELOG entry for #6376.

Conflicts:
	activerecord/CHANGELOG.md
Use Rails to Render Default Index Page

This is an alternative implementation to #7771 thanks to the advice of @spastorino

Rails is a dynamic framework that serves a static index.html by default. One of my first questions ever on IRC was solved by simply deleting my public/index.html file. This file is a source of confusion when starting as it over-rides any set "root" in the routes yet it itself is not listed in the routes. By making the page dynamic by default we can eliminate this confusion.

This PR moves the static index page to an internal controller/route/view similar to `rails/info`. When someone starts a rails server, if no root is defined, this route will take over and the "dynamic" index page from rails/welcome_controller will be rendered. These routes are only added in development. If a developer defines a root in their routes, it automatically takes precedence over this route and will be rendered, with no deleting of files required. 

In addition to removing this source of confusion for new devs, we can now use Rails view helpers to build and render this page. While not the primary intent, the added value of "dogfooding" should not be under-estimated.

The prior PR #7771 had push-back since it introduced developer facing files. This PR solves all of the same problems, but does not have any new developer facing files (it actually removes one). 

cc/ @wsouto, @dickeyxxx, @tyre, @ryanb, @josevalim, @maxim, @subdigital, @steveklabnik

ATP Railties and Actionpack.
Make sure that no extra spaces are created with a non-polymorphic
attributes
Merge pull request #8468 from schneems/schneems/rack-index-page

Use Rails to Render Default Index Page
Match the controller and path names defensively.

Use '\A' instead of '^', and make the alteration shorter.
Merge pull request #8482 from BanzaiMan/defensive_matching_on_default_index_page

Match the controller and path names defensively.
Add String#in_time_zone method

This commit adds a convenience method for converting a string to an
ActiveSupport::TimeWithZone instance using the configured Time.zone or
another passed as an argument.
Explain how to supersede the new dynamic welcome page

The old, static welcome page instructed developers to delete the
public/index.html file and set a root route.  The new, dynamic welcome
page should tell developers (a) why they're seeing it when it doesn't
correspond to anything in the viewable app source and (b) that it can
be superseded with a root route.
Add missing at_end_of_* aliases
Deprecate Date#to_time_in_current_zone

The to_time_in_current_zone method doesn't match the naming of the methods
for converting to ActiveSupport::TimeWithZone on Time and DateTime. Since
DateTime inherits from Date that has led to confusion with some users
using the to_time_in_current_zone method with DateTime instances and having
the time part dropped and the UTC offset lost.

This commit fixes this by deprecating the old method and adding a new
in_time_zone method which matches the naming for DateTime and Time. This
should prevent accidently dropping times and UTC offsets when converting
DateTime instances to ActiveSupport::TimeWithZone.