Master i18n

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

(cherry picked from commit e7a59b87)

27c8319b New translations gitlab.pot (Japanese)
9e33de56 New translations gitlab.pot (Slovak)
43e2fb5d New translations gitlab.pot (Spanish)
cd8fd73c New translations gitlab.pot (Turkish)

Fix sidebar flyout navigation

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

(cherry picked from commit cd300323)

32c5fa99 Fix sidebar flyout navigation

Add back sidekiq metrics exporter

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

(cherry picked from commit 2ede0096)

5c297aa8 Add back sidekiq metrics exporter

Speed up commit loads by disabling BatchLoader replace_methods

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

(cherry picked from commit d8b361af)

89fa2538 Speed up merge request loads by disabling BatchLoader replace_methods
18020f00 Speed up commit loads by disabling BatchLoader replace_methods

disable CI variable complex expressions by default

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

(cherry picked from commit 63e56515)

cbb05dca Disable CI variable complex expressions by default

Backport changes from 'Partially revert d9cb907c: "Avoid loading objects from DB in ES results"'

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

(cherry picked from commit 0a70ba17)

06440b12 Revert "Avoid loading objects from DB in ES results"
0a2c334c Restore some unrelated changes from d9cb907c

Upgrade pages to v1.6.1

Closes gitlab-pages#228

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

(cherry picked from commit 95c16e48)

cca88253 Update GitLab Pages to v1.6.1

Fix diverged branch locals

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

(cherry picked from commit 8ade1f87)

701876cb Fix diverged branch locals

Revert "Automatically update MR merge-ref along merge status"

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

(cherry picked from commit 920fa740)

00a273d3 Revert "Automatically update MR merge-ref along merge status"

Fix pipeline schedule when owner is nil

Closes gitlab-com/gl-infra/production#805 and #63086

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

(cherry picked from commit 74850f1f)

7ac5dfc1 Fix pipeline schedule when owner is nil

Fix UTF-8 conversion issues when resolving conflicts

Closes #63062

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

(cherry picked from commit 641d3323)

1edf1807 Fix UTF-8 conversion issues when resolving conflicts
df650eaa Force source and target branch to binary mode

Handle encoding errors for MergeToRefService

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

(cherry picked from commit d759da76)

8d7fb292 Avoid encoding errors for MergeToRefService

Avoid DB timeouts when scheduling migrations

Closes #63036

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

(cherry picked from commit 9254b5d4)

304b43a6 Avoid DB timeouts when scheduling migrations

Fix nil coercion updating storage size on project statistics

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

(cherry picked from commit d5e8e1ef)

f67e1bec Fix nil coercion updating storage size 
11790387 Add a test case

[Autodeploy] Revert "Merge branch '50070-legacy-attachments' into 'master'"

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

Revert "Merge branch '50070-legacy-attachments' into 'master'"

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

Bump sentry-raven to 2.9

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

Remove example.net, replace with example.com

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

# Conflicts:
#   doc/user/project/clusters/serverless/index.md

Align system note within discussion with other notes

Closes #55033

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

Externalize profiles preferences

Closes #53349

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

Resolve "Merge request discussion text jumps when resolved"

Closes #61565

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

changed dropdown styles in board page

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

Remove list sorting from NewListDropdown

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

Show description of 'gettext:regenerate' task

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

Add a note about nested scopes matching

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

Backport of EE Displaying Blocking MRs

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

Move issue board models to boards directory

Closes #61293

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

Some classes in vue_shared were used only by boards, so they were
moved to the boards directory.

Allow masking if 8 or more characters in base64

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

Fix migration specs using factories

Closes #62911

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

We need to stub default_git_depth and default_git_depth= because some
old migrations specs try to create a record using schema before that
column was introduced.

The `let!` calls were executed before the `before` hook which still
caused some factories to fail, so they're created in the `before` hook
now as well.

Add task count and completed count to responses of Issue and MR

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

Improve email text part

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