Fix typo on the variable name
Merge pull request #15718 from chancancode/regression_from_15694

Fixed a regression introduced in 84cf156
always transcode the file to utf-8

people may be passing filenames to the constructor that are not utf-8,
but they will assome that calling `original_filename` returns utf-8
(because that's what it used to do).
Merge pull request #16183 from goddamnhippie/fix-psych-warning

Implement required #encode_with
Merge pull request #15944 from seuros/uuid

Treat invalid uuid as nil

Conflicts:
	activerecord/CHANGELOG.md
extract inner options before delegating to the helper

If we extract the options from the user facing method call ASAP, then we
can simplify internal logic.
Merge pull request #16190 from oss92/word_truncation

Word truncation
Merge pull request #15917 from luke-gru/actionview_perf

remove Set.new from DetailsKey::get, impacts rendering overhead
Use &= instead of select with include?

The performance is almost the same with both implementations but this is
clear.

Before this patch:

Calculating -------------------------------------
  small erb template      1452 i/100ms
-------------------------------------------------
  small erb template    17462.1 (±13.3%) i/s -      85668 in   5.031395s
.Calculating -------------------------------------
small erb template with 1 partial
                           887 i/100ms
-------------------------------------------------
small erb template with 1 partial
                         8899.6 (±18.8%) i/s -      42576 in   5.009453s
.Calculating -------------------------------------
small erb template with 2 partials
                           666 i/100ms
-------------------------------------------------
small erb template with 2 partials
                         6821.5 (±8.8%) i/s -      33966 in   5.020791s

After the patch:

Calculating -------------------------------------
  small erb template      1479 i/100ms
-------------------------------------------------
  small erb template    15956.6 (±7.6%) i/s -      79866 in   5.036001s
.Calculating -------------------------------------
small erb template with 1 partial
                           841 i/100ms
-------------------------------------------------
small erb template with 1 partial
                         9242.2 (±6.9%) i/s -      46255 in   5.029497s
.Calculating -------------------------------------
small erb template with 2 partials
                           615 i/100ms
-------------------------------------------------
small erb template with 2 partials
                         6524.7 (±6.8%) i/s -      32595 in   5.020456s

You can find the benchmark code at
https://gist.github.com/rafaelfranca/dee31120cfdb1ddc3b56
Merge remote-tracking branch 'origin/master'
Fix typos in string_ext_test.rb [ci skip]
Merge pull request #16195 from jonatack/patch-7

Fix typos in string_ext_test.rb
Merge pull request #16196 from yahonda/mysql_restrict_test

Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"
Remove unused 1:1 association :remote option

This option is unused, left over from pre-1.0 Rails to internally distinguish the location of the foreign key.
Merge pull request #16197 from cgriego/patch-1

Remove unused 1:1 association :remote option
we should be checking if the app is a class

Hopefully `object.class` always returns something that is_a?(Class), so
the previous logic didn't really make sense.
app should always be a class (I suppose)
Rails-ish apps should descend from Rails::Railtie

Use an is_a check to ensure it's a Railsish app so we can avoid
respond_to calls everywhere.
push rails app testing up

this way we only have to test for whether it is a rails app once.
we do not need to dup the options hash, it is private and a new object each call