This resolved the one conflict we have in CE/EE.

Fixed expand full file button showing on images

Closes #59695

See merge request gitlab-org/gitlab-ce!26830

Monitor GraphQL with Prometheus

See merge request gitlab-org/gitlab-ce!26569

Extends graphql's platform tracing class to observe duration
of graphql methods.

In graphql 1.8.11 is added prometheus class but it's not very useful
for us because it uses prometheus_exporter to export results.

CE backport of design-management-upload-client

See merge request gitlab-org/gitlab-ce!26766

Avoid excessive recursive calls with Rugged TreeEntries

Closes #59759

See merge request gitlab-org/gitlab-ce!26813

Merge branch 'ce-10828-follow-up-from-ee-port-externalize-strings-in-projects-controllers' into 'master'

(CE Port) "Follow-up from "(EE port) Externalize strings in projects controllers""

See merge request gitlab-org/gitlab-ce!26832

Migrate issuable states to integer patch 1 of 2

Closes #51789

See merge request gitlab-org/gitlab-ce!25107

Don't sanitize project names on project members page

Closes #58751

See merge request gitlab-org/gitlab-ce!25946

Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.yml

See merge request gitlab-org/gitlab-ce!26534

Tweak coverage parsing examples

See merge request gitlab-org/gitlab-ce!26732

Adds `managed` boolean column to Clusters table

Closes #56557

See merge request gitlab-org/gitlab-ce!26675

Adds boolean field 'managed' to clusters table. This new column will be
used to distinguish those clusters that are automatically managed by
gitlab.

Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/56557

Fix group transfer selection possibilities

Closes #52295

See merge request gitlab-org/gitlab-ce!26123

Document that local tiller is used for Auto DevOps

Closes #58879

See merge request gitlab-org/gitlab-ce!26688

Also note that apps will be released into the Kubernetes namespace for
the environment, and that GitLab < 11.4 used a dedicated Tiller

Fix attempting to drop views in PostgreSQL

See merge request gitlab-org/gitlab-ce!26836

Docs: Fix anchor to deprecated variables doc

See merge request gitlab-org/gitlab-ce!26788

Refactor and restructure environments page

See merge request gitlab-org/gitlab-ce!26400

Refactor and fix pipeline schedules

See merge request gitlab-org/gitlab-ce!26756

Allow streaming io objects into Gitaly

See merge request gitlab-org/gitlab-ce!26738

Fail Jest tests for unhandled Promise rejections

Closes #56053

See merge request gitlab-org/gitlab-ce!26424

Update border radius of form controls and remove space above page titles

See merge request gitlab-org/gitlab-ce!24497

Add jQuery matchers to Jest

Closes #59637

See merge request gitlab-org/gitlab-ce!26722

This allows us to set the encoding of an IO passed without reading it
into memory.

This is useful if we want to stream files into Gitaly. Like we do when
uploading a new file to the repository.

Force a full GC after importing a project

Closes #59477

See merge request gitlab-org/gitlab-ce!26803

Add # frozen_string_literal to spec/workers

See merge request gitlab-org/gitlab-ce!26790

Remove find all tags feature flag

See merge request gitlab-org/gitlab-ce!26746

Refactor the pipeline feature spec

Closes #59747

See merge request gitlab-org/gitlab-ce!26822

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

Fix Container Scanning for Kubernetes Runners

Closes gitlab-ee#5763 and gitlab-ee#6636

See merge request gitlab-org/gitlab-ce!26793

Add details for the first proof reader request

See merge request gitlab-org/gitlab-ce!26812