Session variables for mysql, mysql2, and postgresql adapters can be set
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.
Merge pull request #8346 from sodabrew/patch-1

Add `variables:` to database.yml for mysql, mysql2, and postgresql adapters
Fix method assertion ensuring it will match "end" with the same indentation

Otherwise it was matching "end" lines from blocks within the method body,
making tests such as the migration ones fail.
Omit directories from gemspec.files for RubyGems 2 compat.

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.
Make code statistics rake task handle new test locations properly

As of 2a68f68aead9fd65ecac8062ca8efc15f5bab418:

- 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.
Merge pull request #8466 from gclag/stats-handle-new-test-locations

Make rake task for code statistics handle new test locations properly
Revert "API reader should look elsewhere for helper instructions"

This reverts commit ba2d867b2961b5ef72aad353c2d647b04654cbe3.

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

[ci skip]
Include command to create mysql user

The guide mentions that the 'rails' user is needed, but doesn't
explicitly include the command to do so.
Merge pull request #8469 from kytrinyx/explicit-mysql-instructions

Include command to create mysql user

[ci skip]
Remove the spaces after the open bracket and before the close bracket.

All our generated code follow this rule
revise block on kindle guides [ci skip]
Add test case for scaffold_controller generator without attributes.

This is a test for 978c568a7bffe354180aaefa471092182fed1015
Use the references and belongs_id ids in the scaffold_controller
generator
Move to the schema-migrations-metadata branch.

Pending work on graceful app upgrades.

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

This reverts commit ce8ac39338f86388e70356b3a470b3ea443802ae, reversing
changes made to b0e7b6f67c984d4b1502e801781ed75fad681633.

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

This reverts commit 036d3e1c2b65c4b8cbd23de2e20ad67b9b756182, reversing
changes made to 0c692f4d121792117b6a71e5ed590a31c3b9d12e.

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

This reverts commit 0c692f4d121792117b6a71e5ed590a31c3b9d12e, reversing
changes made to 2e299fca715b083a60222a85e48f9d3b8dd8ce93.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/schema_dumper_test.rb
Revert "Omit directories from gemspec.files for RubyGems 2 compat."

Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f

This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25.
Use `File.expand_path` instead of `File.join`

cc/ @carlosantoniodasilva
Put the reference and belongs_to attributes in the scaffold tests.
Make references and belongs_to attributes to generate the _id column in
fixtures
Deal with polymorphic attributes correctly in the generators
Extract a attributes_names method to avoid duplication