These two methods now handle two additional real-world possibilities:

1. `config/resque.yml` not being present
2. `config/resque.yml` being present but not containing YAML

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34941

Fixed badge alignment in new project sidebar in FireFox

See merge request !12777

Update 9.4 update instructions to include changes made to 9.3 instructions

See merge request !12781

Don't reload ActiveRecord objects when building note URLs

Closes #34882

See merge request !12780

Update source installation instructions for 9.4

See merge request !12779

Update CI templates for 9.4

See merge request !12784

Fix welcome page action items alignment

Closes #34933

See merge request !12778

When we build a note URL, and we have the note loaded already, there are two
cases:

1. The `noteable` is already loaded. In that case, this is faster as it doesn't
   build a new AR object from the query.
2. The `noteable` is not already loaded. In that case, this change is no worse
   than the previous code.

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

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

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

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

Catch redis address error

Closes omnibus-gitlab#2545

See merge request !12542

# Conflicts:
#   lib/gitlab/current_settings.rb

Fix milestones destroy service

See merge request !12762

doc:installation add note about disable-gems for gitlab-shell

See merge request !12765

See https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1707#note_34351820

Adding notation about speeding up `gitlab-shell` by disabling RubyGems

Fixes a performance regression introduced in !12732

We initially started doing this because the first feature test to use
the JavaScript driver would often time out due to asset compilation on
CI. We should still do it in CI since the cost is (relatively) low, but
doing so for every local run is both tiresome and generally unnecessary,
as developer machines will be faster than most shared CI runners, and
the cost of retrying a test after a timeout is much, much lower.