Fix an N+1 in avatar URLs

See merge request gitlab-org/gitlab-ee!5898

Fix layout in admin edit user form (EE)

See merge request gitlab-org/gitlab-ee!5968

[Rails5] Update Gemfile.rails5.lock

See merge request gitlab-org/gitlab-ee!5967

This is tricky: the query was being run in
`ObjectStorage::Extension::RecordsUploads#retrieve_from_store!`, but we can't
just add batch loading there, because the `#upload=` method there would use the
result immediately, making the batch only have one item.

Instead, we can pre-emptively add an item to the batch whenever an avatarable
object is initialized, and then reuse that batch item in
`#retrieve_from_store!`. However, this also has problems:

1. There is a lot of logic in `Avatarable#retrieve_upload_from_batch`.
2. Some of that logic constructs a 'fake' model for the batch key. This should
   be fine, because of ActiveRecord's override of `#==`, but it relies on that
   staying the same.

Fix epic badges in Group sidebar

Closes #6300

See merge request gitlab-org/gitlab-ee!5973

Perform gitlab-ci-token authentication always using primary

See merge request gitlab-org/gitlab-ee!5958

Add Scala to the list of what's supported by SAST

See merge request gitlab-org/gitlab-ee!5880

Bring CE-EE parity to app/services/projects/update_service.rb

See merge request gitlab-org/gitlab-ee!5825

Merge branch '6037-geo-move-out-the-replication-slots-items-from-verification-section-in-geo-admin-screen' into 'master'

Resolve "Geo: Move out the replication slots items from verification section in Geo admin screen"

Closes #6037

See merge request gitlab-org/gitlab-ee!5723

Allow one more line difference for EE specific lines

See merge request gitlab-org/gitlab-ee!5965

Port to EE: Add per-project pipeline id (Use `AtomicInternalId`)

See merge request gitlab-org/gitlab-ee!5745

Remove confusing statement in the message shown for Epics list empty state when filters are applied

Closes #5924

See merge request gitlab-org/gitlab-ee!5630

Rename licence management artifact

Closes #6171

See merge request gitlab-org/gitlab-ee!5874

Resolve "Epics Page Styling is broken"

Closes #6287

See merge request gitlab-org/gitlab-ee!5957

Fix markdown code highlighting

See merge request gitlab-org/gitlab-ee!5941

Resolve "Approvers block in new MR page is broken after BS4"

Closes #6288

See merge request gitlab-org/gitlab-ee!5959

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5825#note_75764799

They're now performed after the `super`.

Preload Group plans in EpicsFinder

Closes #6206

See merge request gitlab-org/gitlab-ee!5877

Enrich Security Reports with more data.

See merge request gitlab-org/gitlab-ee!5878

Update GitHub import instructions

See merge request gitlab-org/gitlab-ee!5963

Add additional Consul/Repmgr troubleshoot details

See merge request gitlab-org/gitlab-ee!5493