[merge-train skip]

[ci skip]

[ci skip]

Prepare 15.6.2-ee release

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105804



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Co-authored-by: Scott Hampton <shampton@gitlab.com>
Co-authored-by: Thong Kuah <tkuah@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: Adam Hegyi <ahegyi@gitlab.com>
Co-authored-by: Doug Stull <dstull@gitlab.com>
Co-authored-by: Mikołaj Wawrzyniak <mwawrzyniak@gitlab.com>
Co-authored-by: Matthias Käppler <mkaeppler@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
Co-authored-by: Gary Holtz <gholtz@gitlab.com>
Co-authored-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Co-authored-by: Lorena Ciutacu <lciutacu@gitlab.com>
Co-authored-by: Jose Ivan Vargas <jvargas@gitlab.com>

Potential fix for flaky user_edit_profile_spec.rb

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105889



Merged-by: Scott Hampton <shampton@gitlab.com>
Approved-by: Scott Hampton <shampton@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

(cherry picked from commit 26df729c)

315065dc Potential fix for flaky user_edit_profile_spec.rb

Consolidate database cleaner code for migrations

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105600



Merged-by: Thong Kuah <tkuah@gitlab.com>
Approved-by: Krasimir Angelov <kangelov@gitlab.com>
Approved-by: Thong Kuah <tkuah@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

(cherry picked from commit 27a01824)

d665e227 Consolidate database cleaner code for migrations

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105375

Changelog: fixed

Revert refactor #98971

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105360



Merged-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Manoj M J <mmj@gitlab.com>
Co-authored-by: Aboobacker MK <akarakath@gitlab.com>

(cherry picked from commit 7489d1a7)

61703726 Revert "Merge branch..."

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105288

Changelog: added

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105220

Changelog: fixed

feat: This updates labkit to version 0.29.0

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105072



Merged-by: Mikołaj Wawrzyniak <mwawrzyniak@gitlab.com>
Approved-by: Mikołaj Wawrzyniak <mwawrzyniak@gitlab.com>
Co-authored-by: Bob Van Landuyt <bob@vanlanduyt.co>

(cherry picked from commit 6326e7eb)

39790ee0 feat: This updates labkit to version 0.29.0
96a4c0b7 Don't expect fips to be read from OpenSSL

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104747

Changelog: fixed

Update GitLab Migration doc about projects migration on .com

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104566



Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Co-authored-by: George Koltsov <gkoltsov@gitlab.com>

(cherry picked from commit 915918eb)

a6ed5aaa Update GitLab Migration doc about projects migration on .com
9e17bd7d Add version history text to bulk_import_projects ff

Potential fix for flaky spec in resolve discussions spec

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104503



Merged-by: Gary Holtz <gholtz@gitlab.com>
Approved-by: Niko Belokolodov <nbelokolodov@gitlab.com>
Approved-by: Gary Holtz <gholtz@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

(cherry picked from commit 06313fd2)

91842f5b Potential fix for flaky spec in resolve discussions spec

Doc: Remove stray comma in /link example

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104351



Merged-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Approved-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Co-authored-by: Peter Leitzen <pleitzen@gitlab.com>

(cherry picked from commit a3635e1c)

b4eb3acd Doc: Remove stray comma in /link example

Fix release number for internal notes

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104261



Merged-by: Lorena Ciutacu <lciutacu@gitlab.com>
Approved-by: Jarka Košanová <jarka@gitlab.com>
Approved-by: Lorena Ciutacu <lciutacu@gitlab.com>
Co-authored-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>

(cherry picked from commit e4975cc8)

da26b52b Fix release number for internal notes

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104259

Changelog: fixed

Add docs for work item description

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104189



Merged-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Co-authored-by: Simon Knox <simon@gitlab.com>

(cherry picked from commit 7530ead0)

fa00ee28 Add docs for work item description
5715fdc1 Move to correct section
848dc0b8 Document rich text in full page view

[merge-train skip]

[ci skip]

[ci skip]

Do not save PipelineMetadata if name is blank [15.6]

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2947



Merged-by: Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
Approved-by: Nikhil George <ngeorge@gitlab.com>
Co-authored-by: Reuben Pereira <rpereira@gitlab.com>

Merge branch 'cherry-pick-6200369c' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2947

Master branch merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105096

Changelog: fixed

Send resolved_address param to gitaly during repository import

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2938



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: Alan (Maciej) Paruszewski <mparuszewski@gitlab.com>

Merge branch 'security-blind-ssrf-import-15-6' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2938

Changelog: security

Add size validation during nuspec file extraction

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2935



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Matthias Käppler <mkaeppler@gitlab.com>
Co-authored-by: David Fernandez <dfernandez@gitlab.com>

Merge branch 'security-nuget-metadata-extaction-zip-entry-size-15-6' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2935

Changelog: security

Cross-site scripting in Jira Integration

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2930



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Matthias Käppler <mkaeppler@gitlab.com>
Co-authored-by: bmarjanovic <bmarjanovic@gitlab.com>

Merge branch 'security-378214-confidential-issue-15-6' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2930

Changelog: security

Protect web-hook secret tokens after changing URL

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2920



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Arturo Herrero <arturo.herrero@gmail.com>
Approved-by: Felipe Artur <fcardozo@gitlab.com>
Co-authored-by: bmarjanovic <bmarjanovic@gitlab.com>

Merge branch 'security-382260-confidential-issue-15-6' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2920

Changelog: security

HTML content injection in README file

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2928



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Brett Walker <bwalker@gitlab.com>

Merge branch 'security-hmtl-injection-15-6' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2928

Changelog: security

Redact secret tokens from web-hook logs

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2916



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Co-authored-by: bmarjanovic <bmarjanovic@gitlab.com>

Merge branch 'security-381895-confidential-issue-15-6' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2916

Changelog: security

Prevent unauthorized users from seeing Release information on tag pages

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2927



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Shinya Maeda <shinya@gitlab.com>
Co-authored-by: Alishan Ladhani <aladhani@gitlab.com>

Merge branch 'security-check-releases-permission-on-tags-page-15-6' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2927

Changelog: security

Update after_import to expire cache before removing prohibited branches

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2905



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Pavel Shutsin <pshutsin@gitlab.com>
Co-authored-by: George Koltsov <gkoltsov@gitlab.com>

Merge branch 'security-remove-hexadecimal-branches-post-import-15-6' into '15-6-stable-ee'

See merge request gitlab-org/security/gitlab!2905

Changelog: security