don't log errors when all is fine
Only merge scopes with zero arity in has_many through

with dynamic conditions.

Fixes #16128

This bug was introduced in https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d
so it's present from 4.1.2-rc1 and after.

https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d
merges any relation scopes passed as proc objects to the relation,
but does *not* take into account the arity of the lambda.

To reproduce: https://gist.github.com/Agis-/5f1f0d664d2cd08dfb9b
Move as/test_test to as/test_case_test
Updated the deprecation warnings to 5.0
Clear deliveries in order not to affect other tests
Merge pull request #16577 from cristianbica/update-deprecation-to-5.0

Updated the deprecation warnings to 5.0
Revert "Do not gsub non ASCII characters in header anchor.".

This reverts commit 699babe.

Also change the upgrading_ruby_on_rails link back to original in 4_2_release_notes.
Merge pull request #16581 from JuanitoFatas/guides-anchor-link

Revert "Do not gsub non ASCII characters in header anchor.".
Merge pull request #16573 from zzak/test_test_to_test_case_test

Move as/test_test to as/test_case_test
[ci skip] Format pass of Active Job Basics guide.
Merge pull request #16145 from phoet/patch-2

don't log errors when all is fine
Fixes the digits counter of AS's NumberToRoundedConverter

Zero has one digit, but Math.log10(0) returns -Infinity. The method
needs to special-case zero.

The patch adds a regression test that is not clearly related to the
underlying issue because digit_count is private and has no coverage.
Gray area.

This bug was uncovered by 60062cf.
Deprecated .deliver / .deliver! to .deliver_now / .deliver_now!
Updated rdoc / guides / release notes related to ActiveJob / ActionMailer
Merge pull request #16583 from JuanitoFatas/doc/patch-1

[ci skip] Format pass of Active Job Basics guide.
Require ActiveJob in case a skip_xxx option is given

Change position of require active_job
Merge pull request #16585 from nicolasblanco/require_active_job

Require ActiveJob in case a skip_xxx option is given
Merge pull request #16582 from cristianbica/actionmailer-deprecate-deliver

Deprecated ActionMailer .deliver and updated ActionMailer / ActiveJob docs/guide
Fix typo in rdoc [ci skip]
Merge pull request #16586 from seuros/master

Fix typo in rdoc [ci skip]