The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.

The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.

The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.

The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.

The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.

Fix `enum` with `alias_attribute`

Correct usage for acceptance validator in guide

[ci skip] Fix broken URL in guides

Remove unused `table` arg for `UniquenessValidator#scope_relation`

Make `name` and `binds` to optional args for `exec_{insert,update,delete}`

When a `GET` request is sent `as: :json` in an integration test the test
should use Rack's method override to change to a post request so the
paramters are included in the postdata. Otherwise it will not encode the
parameters correctly for the integration test.

Because integration test sets up it's own middleware,
`Rack::MethodOverride` needs to be included in the integration tests as
well.

`headers ||= {}` was moved so that headers are never nil. They should
default to a hash.

Fixes #26033

[Eileen M. Uchitelle & Aaron Patterson]

Due to the limited support for inotify (Microsoft/BashOnWindows#216) in
WSL the best thing to do at moment is add a note about skipping spring
and listen when generating your application in the Getting Started guide.

[skip ci]

Fixes #26054.

So this bug is kinda funky. The code path is basically "if we weren't passed an
instance of the class we compose to, and we have a converter, call that".
Ignoring the hash case for a moment, everything after that was roughly intended
to be the "else" clause, meaning that we are expected to have an instance of
the class we compose to. Really, we should be blowing up in that case, as we
can give a much better error message than what they user will likely get (e.g.
`NameError: No method first for String` or something). Still, Ruby is duck
typed, so if the object you're assigning responds to the same methods as the
type you compose to, knock yourself out.

The hash case was added in 36e9be85 to remove a bunch of special cased code from
multiparameter assignment. I wrongly assumed that the only time we'd get a hash
there is in that case. Multiparameter assignment will construct a very specific
hash though, where the keys are integers, and we will have a set of keys
covering `1..part.size` exactly. I'm pretty sure this could actually be passed
around as an array, but that's a different story. Really I should convert this
to something like `class MultiParameterAssignment < Hash; end`, which I might
do soon. However for a change that I'm willing to backport to 4-2-stable, this
is what I want to go with for the time being.

Fixes #25978

The problem isn't the detection but the deadlock itself

`insert`, `update`, `delete`, and `exec_query` have a default value
against `name` and `binds`. But `exec_insert`, `exec_update`, and
`exec_delete` not have. It is an inconvenience and inconsistent.

Add accidentally removed dependency in Gemfile.lock

Follow up to ca0b6d0d.

Guard against jobs that were persisted before we started counting executions by zeroing out nil counters

Since 434df001 week durations are no longer converted to days. This means
we need to add :weeks to the parts that ActiveSupport::TimeWithZone will
consider being of variable duration to take account of DST transitions.

Fixes #26039.

Introduce new ActiveRecord transaction error classes

Closes #26018

`TransactionSerializationError` should inherit `StatementInvalid` for backward compatibility

Avoid duplicated `set_inverse_instance` for target scope

Add documentation for ActiveSupport::StringInquirer [ci skip]

Because `scope` (`target_scope`) is a `AssociationRelation`.
`AssociationRelation` handles `set_inverse_instance`.

https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/association_relation.rb#L31-L33

See also #26022.

Add retry_on/discard_on for better exception handling

Remove unnecessary `set_inverse_instance` in finder methods

Some Rails core members agreed to continue to maintain 4.2 until 5.1 is
released.

[ci skip]