Simply it is sufficient to override `can_perform_case_insensitive_comparison_for?`.

remove unused method

`app_templates_dir` is unused since dc53fe92.

Remove unused Journey code

- `VERSION` shouldn't be there anymore since Journey is technically part
of Action Dispatch now (and thus Action Pack, and follows the normal
Rails versioning scheme)
- `backwards.rb` was only in the file tree because early in the history
  or Journey (back in 2011!), it was moved from under the Rack namespace, to its own
namespace, Journey! This file is no longer required, and is assigning
constants that are no longer needed.

Show proper error message when a non-relation object is passed to AR::Relation#or

Add Action Cable CHANGELOG in release notes [ci skip]

- Previously it used to show error message
    <"undefined method `limit_value' for {:title=>\"Rails\"}:Hash">

- Now it shows following error message.

    >> Post.where.not(name: 'DHH').or(name: 'Tenderlove')
    ArgumentError: You have passed Hash object to #or. Pass an ActiveRecord::Relation object instead.

- Fixes #23714.

Fix semantics of test names for finish option in batches_test

- The change was added in #23099

The JSON API media type should only work wih a JSON API handler

Test parent local_stored_attributes isn't modified

Since the media type 'application/vnd.api+json' is a spec,
it is inappropriate to handle it with the JSON renderer.

This PR removes support for a JSON API media type.

I would recommend the media type be registered on its own as `jsonapi`
when a jsonapi Renderer and deserializer (Http::Parameters::DEFAULT_PARSERS) are added.

Is related to work in https://github.com/rails/rails/pull/21496

This change was added in #23203 and it was not conforming our code style.

application/gzip added as default mime type into mime type list

[ci skip] Updating edge rails guides to include `on_weekday?` on Date, Time and DateTime

[ci skip] Adding `on_weekend?` method in edge rails guides

WIP: Errors in logs should show log tags as well.

Saw the `merge!` and had to prove to myself that the parent model's local_stored_attributes was not being changed when stored_attributes is called on a child model. Proved to be working as expected but this test is probably still useful to keep around.

Correct config option from only_api to api_only in test

Let t.foreign_key use the same `to_table` twice

Conflicts:
	activerecord/CHANGELOG.md

Whenever you are sending emails in integration tests using the `:test`
delivery method you need to make sure that
`ActionMailer::Base.deliveries` is reset after every test. This piece of
boilerplate code is present in all my applications that send
emails. Let's have `ActionDispatch::IntegrationTest` reset the
deliveries automatically.

Use a URL instead of an URL everywhere

Add missing CHANGELOG for regression fix in #18155 which fixes #13387

[ci skip]

A cookie value is incorrect if value contains an escapable string in Rails 5 ActionController::TestCase

Multiple cookie values should be separated by '; ' according
to RFC 6265, section 5.4.4[1].

[1]: https://tools.ietf.org/html/rfc6265#section-5.4

The `cookies` hash isn't updated with the value generated by the output
from `to_header` so it wasn't testing anything. Rendering the cookie
value in the controller makes sure that the escaping is actually working.

Merge branch 'should-escape-cookie' of https://github.com/ma2gedev/rails into ma2gedev-should-escape-cookie

Previously if you used `t.foreign_key` twice within the same
`create_table` block using the same `to_table`, all statements except
the final one would fail silently. For example, the following code:

    def change
      create_table :flights do |t|
        t.integer :from_id, index: true, null: false
        t.integer :to_id,   index: true, null: false

        t.foreign_key :airports, column: :from_id
        t.foreign_key :airports, column: :to_id
      end
    end

Would only create one foreign key, on the column `from_id`.

This commit allows multiple foreign keys to the same table to be created
within one `create_table` block.