Roll back open transactions when the running thread is killed.
Changed the DangerousAttributeError exception message to include messaging that the conflict could be because of a conflicting attribute.
Merge pull request #16669 from aantix/dangerous_attribute_error_better_message

Improved the error messaging for the DangerousAttributeError exception
Change ActiveJob test directory to "test/jobs"
Merge pull request #16908 from y-yagi/change_activejob_test_dir

Change ActiveJob test directory to "test/jobs" [ci skip]
use `allow_blank` option instead
Revert "Merge pull request #15312 from JuanitoFatas/action_view/asset_path"

This reverts commit 21ec7fefea5a1b823cb88733b019b3d52240801d.

Per #16911, there's actually a good reason for a "blank" value to have a
useful `to_s` here. So let's also add some tests to prove that.
Merge pull request #13656 from chanks/rollback_transactions_in_killed_threads

Data corruption risk: Roll back open transactions when the running thread is killed.
Merge pull request #16910 from kuldeepaggarwal/use-rails-options

use `allow_blank` option instead of custom condition
Time#change can now change nanoseconds (:nsec)

Closes #16392.
Rescue Rack::Utils::ParameterTypeError instead of TypeError

As of rack/rack@167b6480235ff00ed5f355698bf00ec2f250f72e, Rack raises
Rack::Utils::ParameterTypeError which inherits TypeError.

In terms of the behavior, Rescuing TypeError still works but this
method shouldn't rescue if TypeError is raised for other reasons.
Merge pull request #16758 from Agis-/time-change-nsec

Add support for `:nsec` option to `Time#change`
Merge pull request #16912 from yuki24/rescue-rack-parameter-type-error

Rescue `Rack::Utils::ParameterTypeError` instead of `TypeError`
Singular credit_card controller name changed to plural
Stop nil checking on safe_append=

ERB compiler guarantees safe_append= will be called with a string, so
nil checks don't make sense.  Anything else calling this method should
check for nil themselves before calling
Pare down and simplify Active Job's rake tasks
Tighten up AJ::Arguments and its tests

* Disallow deserialization of non-primitive objects
* Broaden coverage; remove superfluous tests
simplify test_adapter
Merge pull request #16918 from kiuru/master

Singular credit_card controller name changed to plural [ci skip]
Merge pull request #16920 from seuros/aj

simplify test_adapter