Merge pull request #10458 from bwbuchanan/issue-10451

Make SchemaDumper emit "id: :uuid" when using UUID primary keys
Merge pull request #10404 from chadmoone/fix-pg-uuid-default

Allow override of PostgreSQL UUID primary key default
Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master

Fixes Scaffold generator with --assets=false
Conflicts:
	railties/CHANGELOG.md
Make rake install task depend on build instead of gem

The rake task doesn't build the Rails gem file so it couldn't be installed. The build task builds all the sub-gems and the Rails gem
Merge pull request #10465 from raphweiner/rake_install_depend_on_build

Make rake install task depend on build instead of gem
Merge pull request #10472 from prathamesh-sonpatki/github

Github -> GitHub [ci skip]
Merge pull request #10468 from rimidl/add-missing-require-to-actionview-lookupcontext

Added missing `require` to ActionView::LookupContext
Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets

Fix tests related to scaffolding generator with --assets=false switch
Use Ruby 1.9 syntax
Updated link to to GitHub article about ignoring files [ci skip]

- http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files
dir -> directory [ci skip]
Merge pull request #10479 from frodsan/backport_gitignore_change

Backport gitignore change [ci skip]
Merge pull request #10437 from neerajdotname/10419

raise IrreversibleMigration if no column given
Conflicts:
	activerecord/CHANGELOG.md
let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]

See the comment in the rescue clause towards the top of the patch for the rationale.
Merge pull request #10488 from neerajdotname/10419-b

fix failing test caused by 3771e4d511
Merge pull request #10352 from zohlgren/fix_activerecord_sanitization_sanitize_sql_hash

Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions
Conflicts:
	activerecord/CHANGELOG.md
Fix test asserting the sanitized SQL hash differently to some adapters
Merge pull request #10478 from cainlevy/patch-1

use canonical #controller_path logic in controller test cases
Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy

Confirm a record has not already been destroyed before decrementing counter cache

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #10377 from bricker/template_digest_ending_with_number

Allow numbers in partial name for digesting
Conflicts:
	actionpack/CHANGELOG.md