Allow Pathnames to be added to eager load paths
Merge pull request #12695 from mikepack/allow_pathnames

Allow Pathnames to be added to eager load paths
Drop a sqlite_version check because we only support SQLite 3.6.16 or newer.

Drop some comments that document the implementation rather than the interface.
Remove the unused, undocumented SQLite3Adapter#supports_count_distinct?
    
This has returned true since 3cc9b5f1, and is not used internally.
Merge pull request #11921 from Empact/sqlite-3-cleanup

Remove the unused, undocumented SQLite3Adapter#supports_count_distinct?
`remove_column` does not take a type argument. [ci skip]. Closes #12864
[ci skip] Fix curl response output and use strong parameters in update action.
Merge pull request #12865 from JuanitoFatas/layout-and-render

[ci skip] Fix curl response output and use strong parameters in update action
Revert "`remove_column` does not take a type argument. [ci skip]. Closes #12864"

As of Rails 4.0 `remove_column` is no longer an alias for `remove_columns`.
The type is actually valid and used when issuing a rollback (new `change` method).

This reverts commit 9c9d4948e428a226a19aa92c17fa6ac5833c2fb8.
Ensure that a column added in a test is being removed after all
Fix syntax error in atom_feed example [ci skip]

Builder's #tag! takes either String or Symbol as the first parameter
Merge pull request #12870 from sauliusg/atom-feed-doc-fix

Fix syntax error in atom_feed example [ci skip]
move Relation#merge tests into separate file.
tests for merging Relations of different classes.
fix weird Emacs auto indentation. [ci skip]
Merge branch 'master' into pass_array_to_layout