Raising an error when nil or non-hash is passed to update_attributes.
Add notes about database connection pool [ci skip]
Update references to wycats/thor to erikhuda/thor.
Merge pull request #12329 from benmanns/docrails

Update references to wycats/thor to erikhuda/thor.
Deprecate unused quoted_locking_column method.
Getting Started Guide: update RubyGems Guides link [ci skip]
Merge pull request #12335 from francisgo/patch-1

Getting Started Guide: update RubyGems Guides link [ci skip]
Merge pull request #11423 from kennyj/remove_quoted_locking_column

Remove unused quoted_locking_column method.
add test_scoped_root_as_name

test for regression introduced by https://github.com/rails/rails/pull/9155
Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nil

Raising an error when nil is passed to update_attributes.

Conflicts:
	activerecord/CHANGELOG.md
Include web-console in new projects Gemfile
Merge pull request #11667 from gsamokovarov/introduce-web-console

Include web-console in new projects Gemfile
Add a CHANGELOG entry about Web Console inclusion
Merge pull request #12342 from gsamokovarov/web-console-changelog

Add a CHANGELOG entry about Web Console inclusion
Merge pull request #12337 from rubys/route-formatter-test

add test_scoped_root_as_name
Use join to concat the both side of the AST

Onf of the sides can be nil and it will raise a Conversion error
No need the else clause
Merge pull request #10822 from gaurish/pool

Add note about database connection pool in postgres template