bump the rails version in bug report template
Merge pull request #10254 from wangjohn/refactoring_local_cache

Refactored the storage of a temporary version of the local cache.
The increment and decrement commands in the local cache are exactly the
same, so their logic is being refactored.
Merge pull request #10255 from wangjohn/increment_or_decrement_refactoring_in_local_cache

Refactoring increment and decrement in local cache
Fix subject-verb agreement in error msg (and other grammar stuff)
Use secure source for rubygems in engine tests
Merge pull request #10259 from prathamesh-sonpatki/secure-engine-tests

Use secure source for rubygems in engine tests
stdlib -> standard library
Merge pull request #10258 from thenickcox/pending_migrations_plural

Fix subject-verb agreement in error msg (and other grammar stuff)
Support transactions in Migrator.run
Avoid leak into controller's action_methods
Merge pull request #10262 from printercu/patch-3

Avoid leak into controller's action_methods
Passing subdomain: '' to url_for removes the subdomain (instead of adding a leading .)
Adding a boolean route constraint checks for presence/absence of request property
Duplicate options before mutating them
Add url generation tests for #10185
Refactor ActionDispatch::Http::URL.build_host_url

Add support for extracting the port from the :host option and for
removing the subdomain by using nil, false or ''.
Add CHANGELOG entries - closes #10180, #10185
Merge pull request #10043 from cconstantine/master

DB with postgres string array column doesn't load fixtures well
Bump arel to 4.0.0
Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."

This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d.

Conflicts:
	railties/lib/rails/generators/app_base.rb

Reason: sprockets 2.9.1 fixes this issue