attributes

Conflicts:
	activerecord/CHANGELOG.md

This can be done using the class attribute cache_timestamp_format

Conflicts:
	railties/guides/source/configuring.textile

Conflicts:
	activerecord/test/models/bulb.rb
	activerecord/test/schema/schema.rb

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

the return value of mailer methods should not be relevant

Fix decorate_columns for finding only non-serialized columns

Use `File.expand_path` instead of `File.join`

database

fixtures

cc/ @carlosantoniodasilva

Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f

This reverts commit bb8923de.

Pending work on graceful app upgrades.

Revert "Merge pull request #8439 from joshsusser/fixes"

This reverts commit ce8ac393, reversing
changes made to b0e7b6f6.

Revert "Merge pull request #8431 from joshsusser/schemadump"

This reverts commit 036d3e1c, reversing
changes made to 0c692f4d.

Revert "Merge branch 'joshsusser-master' into merge"

This reverts commit 0c692f4d, reversing
changes made to 2e299fca.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/schema_dumper_test.rb

generator

This is a test for 978c568a

All our generated code follow this rule

Include command to create mysql user

[ci skip]

The guide mentions that the 'rails' user is needed, but doesn't
explicitly include the command to do so.

This reverts commit ba2d867b.

Reason:
https://github.com/lifo/docrails/commit/ba2d867b2961b5ef72aad353c2d647b04654cbe3#commitcomment-2276670

[ci skip]

Make rake task for code statistics handle new test locations properly

As of 2a68f68a:

- Unit tests are now in test/models, instead of test/units
- Functional tests are now in test/controllers, instead of
  test/functional
- Helper tests are now in test/helpers, instead of test/units/helpers
- Mailer tests are now in test/mailers, instead of test/functional

Update the rake task for code statistics (`rake stats`) so that it
recognizes files in the above locations as tests, and accurately
calculates statistics such as "Test LOC" and "Code to Test Ratio."
Safely handle Rails apps that still have tests in the old locations.

RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir.

May revert if rubygems/rubygems#413 is accepted.

Otherwise it was matching "end" lines from blocks within the method body,
making tests such as the migration ones fail.

Add `variables:` to database.yml for mysql, mysql2, and postgresql adapters

Kindle ebook generation with working section navigation

in the new 'variables:' hash in each database config section in database.yml.
The key-value pairs of this hash will be sent in a 'SET key = value, ...'
query on new database connections.

The configure_connection methods from mysql and mysql2 into are
consolidated into the abstract_mysql base class.