Revert "Introduce Bundler and Gemfiles in a NOTE"

This reverts commit 83cb6fbd13f3c5ea3106b9a57964b1a6fb243682.

Reason: very trivial

[ci skip]
copy edits [ci skip]
Merge branch 'master' of github.com:lifo/docrails
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.
update release notes [ci skip]
Merge pull request #8348 from danchoi/master

Kindle ebook generation with working section navigation
Security Guide: removing Mass Assignment.

Since mass assignment doesn't exist anymore, we don't need to discuss it.

I checked with @fxn last night before making this change.
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.
use default_options= instead of default to avoid confusion
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
Globalize2 is only compatible with Rails 2 so link to Globalize3 instead
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