from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2350
+ copyedit (goes  with 80edf00)

snippet has a blob, but isn't a blob

Closes #34729

See merge request !12792

Remove net-ssh gem

Closes #34867

See merge request !12736

Add a simple mode to merge request API

Closes #34920

See merge request !12766

Updated vendor/licenses.csv for 9.4

See merge request !12788

Update Sidekiq from 5.0.0 to 5.0.4

See merge request !12774

Do not show pipeline schedule button for non-member

Closes #34907

See merge request !12757

Fixed badge alignment in new project sidebar in FireFox

See merge request !12777

Autogenerated using `bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv`
Required license_finder 3.0.1 for https://github.com/pivotal/LicenseFinder/pull/304

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

The current "basic" merge request API still loads too much data. For integrations
like the Trello Power-up, we just need the basics.

Closes #34920

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

See: https://github.com/mperham/sidekiq/blob/master/Changes.md

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