[merge-train skip]

[ci skip]

Prepare 17.1.1 release for gitlab-jh

See merge request gitlab-cn/gitlab!2553

rspec-ee unit predictive

This reverts commit 6b3f276d.

rspec-ee unit predictive

[merge-train skip]

[ci skip]

[ci skip]

Fix MailRoom not loading in Omnibus

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



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Mario Celi <mcelicalderon@gitlab.com>

Security fixes for banzai pipeline

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



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Jerry Seto <jseto@gitlab.com>
Co-authored-by: Brett Walker <bwalker@gitlab.com>

Merge branch 'security-banzai-pipeline-17-1' into '17-1-stable-ee'

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

Changelog: security

Fix the catastrophic backtracking in openapi regex

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



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Co-authored-by: rkumar555 <rkumar@gitlab.com>

Merge branch 'security-1112-redos-openapi' into '17-1-stable-ee'

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

Changelog: security

Use permitted_params for standalone and multiplex queries

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Heinrich Lee Yu <heinrich@gitlab.com>
Co-authored-by: Roy Zwambag <rzwambag@gitlab.com>

Merge branch 'security-introspection-query-multiplex-fix-17-1' into '17-1-stable-ee'

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

Changelog: security

Fix for Private job artifacts can be accessed by any user

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Max Orefice <morefice@gitlab.com>
Co-authored-by: Shabini Rajadas <srajadas@gitlab.com>

Merge branch 'security-security_deny_access_to_private_artifacts-17-1' into '17-1-stable-ee'

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

Changelog: security

Remove search results from public projects with unauthorized repos

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



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

Merge branch 'security-zoekt-omit-private-repos-from-public-projects-17-1' into '17-1-stable-ee'

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

Changelog: security

Do not run a new pipeline on re-target

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Approved-by: Payton Burdette <pburdette@gitlab.com>
Co-authored-by: Patrick Bajao <ebajao@gitlab.com>

Merge branch 'security-retarget-no-pipeline-squash-17-1' into '17-1-stable-ee'

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

Changelog: security

Add limits on autolinker regex

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Greg Alfaro <galfaro@gitlab.com>
Approved-by: Jessie Young <jessieyoung@gitlab.com>
Co-authored-by: Brett Walker <bwalker@gitlab.com>

Merge branch 'security-redos-autolink-filter-17-1' into '17-1-stable-ee'

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

Changelog: security

Fix clickjacking on OAuth application page

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: Aboobacker MK <akarakath@gitlab.com>

Merge branch 'security-security_clickjacking_authorize-17-1' into '17-1-stable-ee'

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

Changelog: security

Hide branch merge request if merge requests are private

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Phil Hughes <me@iamphill.com>

Merge branch 'security-ph/1122/hideBranchMergeRequest-17-1' into '17-1-stable-ee'

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

Changelog: security

Merge branch 'security-ph/1121/removeCollapseLongCommitListFromDeprecatedNotes-17-1' into '17-1-stable-ee'

Remove collapseLongCommitList method

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Phil Hughes <me@iamphill.com>

Merge branch 'security-ph/1121/removeCollapseLongCommitListFromDeprecatedNotes-17-1' into '17-1-stable-ee'

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

Changelog: security

Pass SSO session data to Sidekiq

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Gosia Ksionek <mksionek@gitlab.com>
Co-authored-by: Mark Chao <mchao@gitlab.com>

Merge branch 'security-452548-sso-2-17-1' into '17-1-stable-ee'

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

Changelog: security

Prevent non-members from using promote_to quick action for quick actions

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Javiera Tapia <jtapia@gitlab.com>
Co-authored-by: Joseph Wambua <jjoshua@gitlab.com>

Merge branch 'jj-457235-promote-quick-action-prevent-non-member-17-1' into '17-1-stable-ee'

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

Changelog: security

Reject deletion of security policy project approval rules

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Marc Saleiko <msaleiko@gitlab.com>
Approved-by: Jerry Seto <jseto@gitlab.com>
Reviewed-by: Marc Saleiko <msaleiko@gitlab.com>
Co-authored-by: Dominic Bauer <dbauer@gitlab.com>

Merge branch 'security-464017-confidential-issue-17-1' into '17-1-stable-ee'

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

Changelog: security

Mitigate ReDoS attacks via `method_call_regex`

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Co-authored-by: Joe Woodward <j@joewoodward.me>

Merge branch 'security-method_call_regex-17-1' into '17-1-stable-ee'

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

Changelog: security