Raising an error when nil or non-hash is passed to update_attributes.
Add notes about database connection pool [ci skip]
We shouldn't override PostgreSQLAdapter's superclass inheritance while monkeypatching

Changing Inheritance section leads to following error on JRuby

    TypeError: superclass mismatch for class PostgreSQLAdapter

After this change,
Jruby: The above error no longer appear. Tests are still failing but they do run. Progress!
MRI: No change, all green(tested by running take test_test_postgresql)

Thanks to Aditya Sanghi(@asanghi) for help
Merge pull request #12315 from gaurish/super

TypeError: superclass mismatch for class PostgreSQLAdapter
Fix the model name in the association basics guides

[ci skip]
bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows
Merge pull request #12325 from tjschuck/bcrypt_version_bump

Bump bcrypt-ruby version to support Ruby 2.0 on Windows
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