This reverts commit 82de7d3a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

CE Upstream - Tuesday

Closes #2890, omnibus-gitlab#2545, and gitlab-qa#56

See merge request !2402

[ci skip]

[ci skip]

Added CE to EE update guide for 9.4

See merge request !2407

The :caching metadata was renamed to :use_clean_rails_memory_store_caching

Closes #2901

See merge request !2403

Signed-off-by: Rémy Coutable <remy@rymai.me>

Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'"

Closes #34942

See merge request !12783

Disabled prepared statements in test

See merge request !12773

This reverts merge request !12753

Reduce parallelization of Spinach jobs and increase the RSpec ones

Closes #34911

See merge request !12760

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Don't attempt to warm the Capybara cache outside of CI

See merge request !12761

Remove the need to use health check token by adding ability to whitelist hosts

Closes #33949

See merge request !12612

Increase z index of mini pipeline dropdown

Closes #34909

See merge request !12767

Paginate the merge requests API earlier to avoid eager loading every merge request

See merge request !12764

Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`

Closes gitlab-ee#2890

See merge request !12770

Bump knapsack to 1.14.0

Closes #34902

See merge request !12753

Repair Regression caused by - !11573

See merge request !12775

Update docs for different sshd_config path for Omnibus Docker.

See merge request !2400

some changes introduced by 4daa6da5, 26b6e299, 17898ce0 were regressed during today's merge conflict resolution of !11573.

This commit serves to reapply those changes.

/cc: @rspeicher @stanhu @mikegreiling

CE upstream: Pre-9.4 RC1

Closes #2890, #2878, #2716, gitlab-ce#34847, gitaly#355, #2839, and gitlab-ce#32568

See merge request !2390

Some tests may test migrations and change the types of columns. If this
happens, Rails may cache a statement that will cause PostgreSQL to fail with
the message, "cached plan must not change result type":
https://github.com/rails/rails/issues/12330

This happened in https://gitlab.com/gitlab-org/gitlab-ee/issues/2890#note_34636077.

Support multiple Redis instances based on queue type

See merge request !11573

Closes gitlab-org/gitlab-ee#2890

Closes #2890

Catch redis address error

Closes omnibus-gitlab#2545

See merge request !12542