Merge pull request #96 from miyagawa/seiralize_globalid

Call #to_s when serializing GlobalID. Fix #95
Remove unneccessary special case for money in quoting
Add arel to the controller template
[ci skip] /javascript/ -> JavaScript - cover whole app
:fire: these are lambdas now [ci skip]

This has changed since around 2b1500d6
link directory to ActionMailer Previews documentation
remove bundler magic
Display notice in index.html pages in scaffolded generated views

As we are setting notice in destroy action we should display that

For more information see https://github.com/rails/rails/pull/14044
And https://github.com/rails/jbuilder/pull/191

closes #14044
Merge pull request #16048 from arunagw/aa-added-notice-index-page

Display notice in index.html pages in scaffolded generated views
After find-via-reload, the record is not new
add test coverage for the action mailer
Merge pull request #16037 from sgrif/sg-money-quoting

Remove unneccessary special case for money in quoting
Merge pull request #16046 from grosser/grosser/cleangen

Do not load rails without loading bundler
Merge pull request #16049 from matthewd/find-via-reload

After find-via-reload, the record is not new
Merge pull request #16042 from akshay-vishnoi/doc_change

[ci skip] /javascript/ -> JavaScript - cover whole app
Merge pull request #14005 from dmitry/test_coverage_for_actionmailer

Add test coverage for the action mailer
Merge pull request #16040 from seuros/patch-1

Add arel to the controller template [ci skip]
Merge pull request #16011 from xjlu/token_and_options

Improve token_and_options regex and test
Merge pull request #16028 from cade/fix_counter_cache_count_with_association_selects

Add `:all` argument to `count` in `reset_counters`

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #16003 from sgrif/sg-refactor-sqlite3-strings

Use a type object for type casting behavior on SQLite3