Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23636

Resolve "Use read_repository scope on read-only files endpoints"

Closes #54826

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

Add endpoint to download single artifact by ref

Closes #54626

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

Fix collapsing discussion replies

Closes #54646

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

Fix gitlab:web_hook tasks

Closes #54975

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

(cherry picked from commit 966e242e)

73294804 Fix gitlab:web_hook tasks

Avoid 500's when serializing legacy diff notes

Closes #54793

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

(cherry picked from commit 61bc233e)

89a67601 Avoid 500's when serializing legacy diff notes

Fix multiple commits shade overlapping vertical discussion line

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

(cherry picked from commit ce00a9c8)

e0000b85 Fix multiple commits shade overlapping vertical discussion line
495a0b36 Add CHANGELOG entry.

[ci skip]

[11.5]: Validate LFS hrefs before downloading them

See merge request gitlab/gitlabhq!2698

[ci skip]

[11.5] Prevent a path traversal attack on global file templates

See merge request gitlab/gitlabhq!2669

[ci skip]

Prepare 11.5.2 release

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

In `11.5` we are still running on rails 4 so there is no need to
specify which version on the migration to run on.

Move drop_site_statistics to be a post deployment migration

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

Remove Site Statistic

Closes #53778

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

Fixed failing eslint

Clear BatchLoader context between Sidekiq jobs

Closes #53079

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

Allow commenting to resolved non-diff discussions

Closes #54330

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

Port of EE-translations to CE

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

Fixes stuck tooltip on stop env button

Closes #53571 and #54282

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

Move cloud-native-image to the post-test stage

Closes charts/gitlab#897

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

Fix handling of filenames with hash characters in tree view

Closes #54473

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

(cherry picked from commit 5d82035f)

e8da70e6 Fix handling of filenames with hash characters in tree view

[Docs] Update issue boards images for recent cards redesign

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

(cherry picked from commit ea8f0f3b)

04d03cd5 [Docs] Update issue boards imgs for new redesign

Correctly handle data-loss scenarios when encrypting columns

Closes #53763

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

(cherry picked from commit 1524a193)

6ddefe7c Correctly handle data-loss scenarios when encrypting columns

Resolve "`fetch-assets` job times out so `package-and-qa` jobs can't complete"

Closes #54293

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

(cherry picked from commit 85cc480f)

b57c1fa7 Pass GITLAB_REF_SLUG to the Omnibus triggers

Add documentation for notes filters

Closes #53908

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

(cherry picked from commit 1c35c6a5)

485c4c55 Add documentation for notes filters

Fixed the dimensions of image diffs

Closes #54236

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

(cherry picked from commit 117fb448)

db56c32c Fixed the dimensions of image diffs

Add user docs for Pages access control

Closes #54143

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

(cherry picked from commit 103267f7)

d5d5f90c Add user docs for Pages access control
44b2dc73 Change project permissions img to include Pages access control
9ec9c563 Remove unneeded auth info on admin pages access control
4ce0ef0e Merge branch 'master' into docs/pages-access-control
9cbbc53f Make Pages visibility list clearer

Fix not render emoji in filter dropdown

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

(cherry picked from commit 8dd89f03)

428b220a Fix not render emoji in filter dropdown
59e5bad1 Fix spec to catch not rendering emoji

Add docs on post-merge pipelines

Closes #53527

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

(cherry picked from commit 7b61774a)

b6438aa8 Add docs on post-merge pipelines