[merge-train skip]

[ci skip]

[ci skip]

Mark any CI builds that are not complete as canceled when imported

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Fabio Pitino <fpitino@gitlab.com>
Co-authored-by: Jessie Young <jessieyoung@gitlab.com>

Merge branch 'jy-import-runner-security-16.4' into '16-4-stable-ee'

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

Changelog: security

Destroy group service accounts when removing group

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Patrick Bajao <ebajao@gitlab.com>
Co-authored-by: Jarka Košanová <jarka@gitlab.com>

Merge branch 'security-service-account-removal-fix-16-4' into '16-4-stable-ee'

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

Changelog: security

Fix SSO Enforcement for shared groups and projects

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Co-authored-by: Jarka Košanová <jarka@gitlab.com>

Merge branch 'security-enforce-sso-shared-groups-16-4' into '16-4-stable-ee'

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

Changelog: security

Prevents Ci::Build data from being rendered

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Aleksei Lipniagov <alipniagov@gitlab.com>
Co-authored-by: Eduardo Bonet <ebonet@gitlab.com>

Merge branch 'security-master-16-4' into '16-4-stable-ee'

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

Changelog: security

Merge branch 'security-prevent-security-policy-bot-to-be-member-of-multiple-projects-16-4' into '16-4-stable-ee'

Allow only one membership for security policy bots

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Co-authored-by: Andy Soiron <asoiron@gitlab.com>

Merge branch 'security-prevent-security-policy-bot-to-be-member-of-multiple-projects-16-4' into '16-4-stable-ee'

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

Changelog: security

Reset all approvals when target branch changes

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Etienne Baqué <ebaque@gitlab.com>
Co-authored-by: Patrick Bajao <ebajao@gitlab.com>

Merge branch 'security-reset-approvals-target-branch-change-16-4' into '16-4-stable-ee'

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

Changelog: security

Default to using the asset proxy

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



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

Merge branch 'security-dcouture-asset-proxy-16-4' into '16-4-stable-ee'

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

Changelog: security

Restrict Project Fork Linking to Owners and Admins

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Max Woolf <mwoolf@gitlab.com>
Co-authored-by: Joe Woodward <jwoodward@gitlab.com>

Merge branch 'security-417481-fork-permissions-16-4' into '16-4-stable-ee'

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

Changelog: security

Prevent math hijacking page elements

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Himanshu Kapoor <info@fleon.org>
Co-authored-by: Brett Walker <bwalker@gitlab.com>

Merge branch 'security-math-escapes-container-16-4' into '16-4-stable-ee'

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

Changelog: security

Delete of member branch protection rules cascadingly

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Co-authored-by: Patrick Cyiza <jpcyiza@gitlab.com>

Merge branch 'security-972-security-delete-access-levels-properly-16-4' into '16-4-stable-ee'

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

Changelog: security

Prevent collaboration across forks when author cannot push

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Gary Holtz <gholtz@gitlab.com>
Co-authored-by: j.seto <jseto@gitlab.com>

Merge branch 'security-419972-collaboration-mr-from-ex-developer-16-4' into '16-4-stable-ee'

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

Changelog: security

Allow Maintainer+ to list Sentry projects

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



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

Merge branch 'security-reporter-list-sentry-projects-16-4' into '16-4-stable-ee'

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

Changelog: security

Fix leaking source code of restricted project through a fork

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Patrick Cyiza <jpcyiza@gitlab.com>

Merge branch 'security-939-security-commit-fork-16-4' into '16-4-stable-ee'

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

Changelog: security

Prevent leaking CI variables via fork MRs

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Furkan Ayhan <furkanayhn@gmail.com>
Co-authored-by: lma-git <lma@gitlab.com>

Merge branch 'security-verify-project-sha-ci-config-16-4' into '16-4-stable-ee'

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

Changelog: security

Pipelines will have no access to protected vars and may fail with tags

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Avielle Wolfe <awolfe@gitlab.com>
Co-authored-by: Laura Montemayor <lmontemayor@gitlab.com>

Merge branch 'security-tag-name-check-16-4' into '16-4-stable-ee'

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

Changelog: security

[merge-train skip]

[ci skip]

[ci skip]

[merge-train skip]

Merge branch '10io-remove-flaky-workhorse-dependency-proxy-tests' into 16.4

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



Merged-by: Steve Abrams <sabrams@gitlab.com>
Approved-by: Steve Abrams <sabrams@gitlab.com>
Co-authored-by: Igor Drozdov <idrozdov@gitlab.com>

Remove flaky tests from the dependency proxy suite

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



Merged-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: David Fernandez <dfernandez@gitlab.com>

(cherry picked from commit 7f2889ba)

568275fe Remove flaky tests from the dependency proxy suite

[merge-train skip]