private method doesn't work for singleton methods defined this way
Add tests to ActiveSupport:XmlMini to_tag method
Fix insertion of records for hmt association with scope, fix #3548
Auto-generate stable fixture UUIDs on PostgreSQL.
Fixes: #11524
Merge pull request #12016 from roderickvd/uuid_fixes

Auto-generate stable fixture UUIDs on PostgreSQL

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/adapters/postgresql/uuid_test.rb
	activesupport/CHANGELOG.md
W3C CSP document moved to gihub.io URL [ci skip]

The old link https://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-specification.dev.html is now being soft redirected to this new URL
Merge pull request #14612 from acallaghan/patch-1

W3C CSP document moved to gihub.io URL [ci skip]
Use SVG version of travis build status badge [skip ci]
Merge pull request #14623 from t3chnoboy/master

Use SVG version of travis build status badge [ci skip]
Fix setup of adding _flash_types test.

Adding flash types to a controller within any of the tests will result
in a global state change of the controller under test.

This patch will prevent state leaks and allow us to run the test in random order.
Merge pull request #14614 from tgxworld/fix_add_flash_types_test

Fix setup of adding _flash_types test.
Added OS X specific commands to installation guide [ci skip]
Recommended using homebrew for installing MySQL and PostgreSQL
fix CollectionProxy delete_all documentation

This method no longer returns an array of all records that
have been removed. Correct documentation to reflect this change.

See issue 14546
Merge pull request #14626 from eileencodes/fix_incorrect_collection_proxy_delete_all_documentation

fix CollectionProxy delete_all documentation
Remove unused `subclass_controller_with_flash_type_bar` var from flash test.
Merge pull request #14624 from jamox/dev_install_guide

Added OS X specific commands to installation guide [ci skip]
Merge pull request #14628 from vipulnsward/remove-flash-test-warning

Remove unused `subclass_controller_with_flash_type_bar` var from flash test.
make enums distinct per class
Merge pull request #14609 from evanwhalen/enums_inheritance

Make enums distinct per class
Ignore order when doing count.

This is necessary because Postgresql doesn't play nice with ORDER BY and
no GROUP BY.

Fixes #14621.