Make `String#remove` and `String#remove!` accept multiple arguments
Merge pull request #17064 from frenkel/fix_select_tag_include_blank

Use include_blank value as option label
:scissors:
Use new hash syntax
Add CHANGELOG entry for #17064
Prefix internal method with _

This will avoid naming clash with user defined methods
Fix typo in error message when non-boolean value is assigned to boolean column
Making the actionmailer docs more explicit to understand [ci skip]
Merge branch 'rishijain-update_docs_1'
Merge pull request #17397 from prathamesh-sonpatki/fix-type-boolean-error-msg-ci-skip

Fix typo in error message when non-boolean value is assigned to boolean column
Merge pull request #17330 from DanOlson/rewhere

Fix Relation#rewhere to work with Range values
Add back --skip-turbolinks and remove --skip-gems

For the most part of cases --skip-gems option just remove one line in
the Gemfile. This is not worth for the complexity it adds.

Closes #17196
Added queue_name_delimiter attribute.

- Added ActiveJob::Base#queue_name_delimiter to allow for
  developers using ActiveJob to change the delimiter from the default
  ('_') to whatever else they may be using (e.g., '.', '-', ...).

- Updated source guide to include a blurb about the delimiter.
Merge pull request #17362 from bronzle/fix_debug_exceptions_app

Show the user’s application in the source window and select the correct ...
Merge pull request #14143 from derekprior/dp-compound-index-ordering

Use type column first in multi-column indexes

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #17374 from maurogeorge/scope-exception

Raises ArgumentError when try to define a scope without a callable
Allow Relation#rewhere to work with infinite range values
UrlGenerationError are not catched as 404 anymore
Fix rbx generated Gemfile regex

https://travis-ci.org/rails/rails/jobs/39190983#L460

 1) Failure:
 AppGeneratorTest#test_psych_gem
 [test/generators/app_generator_test.rb:495]:
 Expected /gem 'psych',\s+'~> 2.0', \s+platforms: :rbx/ to match <snip>
 http://git.io/uuLVag)\ngem 'psych', '~> 2.0', platforms: :rbx\n\n
Merge pull request #17405 from DanOlson/rewhere

Allow Relation#rewhere to work with infinite range values