Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master'

Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error"

Closes #44564

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

Merge branch '44218-add-internationalization-support-for-the-prometheus-merge-request-widget' into 'master'

Resolve "Add internationalization support for the Prometheus Merge Request widget"

Closes #44218

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

When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
always call `lines`, which meant that we didn't get the benefit of the
side-effect from that, where it forced the conflict data itself to UTF-8.

To fix that, make this explicit by separating the `raw_content` (any encoding)
from the `content` (which is either UTF-8, or an exception is raised).

Resolve "Problem with prettier setting trailingComma: all"

Closes #44589

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

Move GitLab.com settings under main docs

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

Use gitlab-shell 7.1.1

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

Fix EncodingHelper#clean blowing up on UTF-16BE strings

Closes gitaly#1101

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

Rollback to a set version instead of an arbitrary number of steps

Closes #40302

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

Resolve "Autolinking includes trailing exclamation marks"

Closes #44587

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

Add Vue resource interceptor to performance bar

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

HTTPS only Pages

Closes #28857

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

Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4

Closes #44554

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

Update the menu information to access "Schedules" page

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

Update Prettier Print Width to 100

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

Resolve "Limit number of failed logins using LDAP for authentication"

Closes #43525

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

Request Chinese Traditional proofreader permissions.

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

Show gitaly address instead of disk path

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

Fix issuable state indicator

Closes gitlab-ee#4683

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

Resolve "Indicate supported image formats in avatar error"

Closes #43771

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

Merge branch '43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information' into 'master'

Resolve "Enabling Auto DevOps on an empty project gives you wrong information"

Closes #43482

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

Route path lookups through legacy_disk_path

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

Rename modal.vue to deprecated_modal.vue

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

Now the issuable reference check works only in project scope, if we
reference an issuable from a non-project resource (e.g. epics), then
project is not set, and there is mismatch in generated issue references.

This patch enables issuable reference state check also from group scope.

Closes gitlab-ee#4683
Related to #30916

Increase the memory limits used in the unicorn killer

Closes gitlab-com/infrastructure#19

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

Add read-only banner to all pages

Closes #43937

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

These limits were updated in our docs, and in omnibus some time ago. But
the defaults in the source-install were missed.

The previously hard-coded value can fail when new migrations are introduced
since multiple migrations may need to be rolled back atomically.

Closes #40302