Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497

Update Emoji digests and assets with latest from Gemojione v3.3.0

Closes #32634

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

Truncate tree to max 1,000 items and display notice to users

Closes #39746

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

Merge branch '40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added' into 'master'

Resolve "Only one note webhook is triggered when a comment with time spent is added"

Closes #40122

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

Fix gitlab:backup rake for hashed storage based repositories

Closes #39573

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

Merge branch '40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forks' into 'master'

Always fetch master from the canonical remote

Closes #40186

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

fix typo

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

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

Rendering ten thousands of tree items consumes a lot of server
time and can cause timeouts in extreme cases. Realistically,
displaying more than 1,000 files is probably not useful so
truncate and show the user a notice instead. 'Find files' can be
used to locate specific files beyond the 1,000 limit.

This way, if a fork's master branch is far behind the canonical's
master, it won't use the tip of the fork's master branch as merge base
and thus won't create a huge and wrong patch file.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Prefer polymorphism over specific type checks in Import service

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

Update gitlab-workhorse to v3.3.1

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

Raise the QA Capybara's default wait time from 4 to 10

Closes gitlab-qa#103

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

Add simple logging to UpdateMergeRequestsWorker#perform

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

Remove approvals when in empty MR widget state -- CE backport

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

Merge branch '33338-internationalization-support-for-prometheus-service-configuration' into 'master'

Resolve "Internationalization support for Prometheus Service Configuration"

Closes #33338

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

Tested on the following platforms that split the emoji into separate
characters currently.
 - Windows 10 FCU
    - Chrome 62.0.3202.89
    - Firefox 57.0b14
    - MS Edge 41.16299.15.0
 - macOS 10.12.6
    - Chrome 63.0.3239.40
    - Safari 11.0.1 (12604.3.5.1.1)
    - Firefox 57.0
 - Ubuntu 16.04
    - Chromium 62.0.3202.75
    - Firefox 56.0

Replace 'charts' with 'chart'

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

Update licensing docs to clarify process for node modules

Closes #38007

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

40161 Remove extra margin from wordmark in header

Closes #40161

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

skip_gitaly_mock disables Gitaly in specs

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

Auto DevOps' gitlab-ci.yml expects a directory named 'chart'.

See also: https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/114

[ci skip]

Include child projects a user can manage in namespace dropdowns

Closes #39987

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

Update queries to remove duplicate entries (CE version)

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

Fix typo

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

We were seeing intermittent failures on CI due to slow responses from
certain endpoints.

So the groups with the same parent are listed together.

The recursive cte seemed to do it by itself, but it is not
guaranteed. By ordering on the `route.path` that includes every parent
group, we can assume they're going to be in the right order.