Raising an error when nil or non-hash is passed to update_attributes.
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.
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