We no longer link JS by default, we need to modify manifest.js for that
now.

We no longer link all js by default, so we should do this test with a
css instead (we don't care about that specifics of the dir just that its
in the manifest and in this dir).

Fix Active Job Sidekiq integration tests

Check that entire collection has been loaded before short circuiting

Address test_statement_cache_with_in_clause failure

Fix "NameError: undefined local variable or method `primary' for #<ApplicationTests::ServerTest:0x000055df43b391d8>"

Merge pull request #37489 from giraffate/fix_random_ci_failure_due_to_non-deterministic_sorting_order

Fix random CI failure due to non-deterministic sorting order

https://travis-ci.org/rails/rails/jobs/491045821#L1528-L1531

Address occasional test_pluck_columns_with_same_name failure

https://buildkite.com/rails/rails/builds/64281#b6f8859b-ee39-40d7-8f0a-d0ba78efbf03/1001-1012

https://travis-ci.org/rails/rails/jobs/375326992#L1160-L1166

Fix activestorage CI failure due to ffprove version differece

Update test to avoid Puma output format change

Maintain extra joins for string or complex arel conditions

See parent commit for more info.

Thor will show a deprecation if a command fails and this method is not
define. We should investigate which command we want to return a non-zero
status when it fails but for now I'm just disabling the warning and
keeping the old behavior.

Fix autosave validation context regression

Follow up #37303.

https://buildkite.com/rails/rails/builds/63957#dc16cd12-10a2-435c-9b64-b8332114d92a/981-1293

Use String#+@ before mutating the result of Symbol#to_s

Rollback in `after_commit` should not rollback state that already been succeeded

Fix "autosave: true" on belongs_to of join model causes invalid records to be saved

Add doc about I18n support for :placeholder option [ci skip]

Since 9c913116, if you run `rackup`
in a machine that doesn't have that folder, the server will not start.

This doesn't happen on `rails s` because we create that folder when
starting the server on
https://github.com/rails/rails/blob/8c8b02784a637570451d7810fd3dfed4eae9a77d/railties/lib/rails/commands/server/server_command.rb#L70-L74.

Remove lock from method model