pass the preloader down so we only have to construct one
Merge pull request #12329 from benmanns/docrails

Update references to wycats/thor to erikhuda/thor.
adding a test for sti on middle tables with sorting on RHS
we can't sort by lhs since the middle records have difference classes
and possibly different rules for finding those objects
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
ActiveRecord::ConnectionAdapters::Column.string_to_time method respects string with timezone. Closes #12278.
Include web-console in new projects Gemfile
Merge pull request #11667 from gsamokovarov/introduce-web-console

Include web-console in new projects Gemfile
added column type to example in section 2.3
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