Post.where(id: 1).or(Post.where(id: 2)).where(foo: 3).unscope(where: :foo).where_clause.binds.map(&:value)
Would return [2, 3] instead of the expected [1,2]

Create `rails@localhost` user on travis ci

Backport #29821 to 5-1-stable 

Set `RAILS_ENV` before load application file

Merge pull request #29757 from lugray/hash_with_indifferent_access_default

Fix HashWithIndifferentAccess#default when include?(nil)

Scrub the invalid paramter value before using it in the error

Added fixed links to code for Rails Guides ActiveSupport

This change was introduced by #18109. The intent of that change was to
specifically apply `unscoped`, not to allow all changes to
`current_scope` to affect the join. The idea of allowing `current_scope`
to affect joins is interesting and potentially more consistent, but has
sever problems associated with it. The fact that we're specifically
stripping out joins indicates one such problem (and potentially leads to
invalid queries).

Ultimately it's difficult to reason about what `Posts.joins(:users)`
actually means if it's affected by `User.current_scope`, and it's
difficult to specifically control what does or doesn't get added. If we
were starting from scratch, I don't think I'd have `joins` be affected
by `default_scope` either, but that's too big of a breaking change to
make at this point.

With this change, we no longer apply `current_scope` when bringing in
joins, with the singular exception of the motivating use case which
introduced this bug, which is providing a way to *opt-out* of having the
default scope apply to joins.

Fixes #29338.

Replace Erubis with Erubi in a part of guide [ci skip]

Merge pull request #29772 from y-yagi/allow_to_edit_secrets_in_mutiple_applications_at_the_same_time

Allow to edit secrets in mutiple apps at the same time

Don't eagerly require Rails' minitest plugin.

Do not update `secrets.yml.enc` when secretes do not change

Treat secrets as binary

Load environment file in `dbconsole` command

It's possible for developers toadd a custom driver and then call it
using `driven_by`. Because we were only skipping `register` for
`:rack_test` that meant any custom driver would attempt to be registered
as well.

The three listed here are special because Rails registers them with
special options. If you're registering your own custom driver then you
don't want to separately register that driver.

Fixes #29688

Allow mounting same engine under several locations

Now that the parameters configurations are only loaded when
ActionController::Base is we need to foce them to load in our tests. In
an application this is not needed since every request already load the
controllers.

Add missing `attr_name.to_s` in `AttributeMutationTracker`

We need to configure it only when ActionController::Base is loaded
otherwise configs on initializers will not work.

Closes #29527.

Allow the use of Bundler 2.0

Fix the class name --> ActionController::Parameters [ci skip]

Fallback Parameters#to_s to Hash#to_s

Fix to scoping is correctly restored

Fix `ids_reader` to respect case sensitive primary key

ActiveRecord: do not create "has many through" records that have been removed

Fix missing formats in route-set URLs

Fix typo in callback deprecation message

Add more explicit guidance on how to fix callback deprecations

Calling `follow_redirect!` does not reset the `html_document`:

Fix regression with date helper in 5.1.2