[merge-train skip]

[ci skip]

[ci skip]

Fix infinite loop when finding component project

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



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

Merge branch 'security-security/fix-infinite-loop-component-project-16-5' into '16-5-stable-ee'

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

Changelog: security

Guard gitlab_version_check helper

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Kassio Borges <kborges@gitlab.com>
Co-authored-by: Lukas Eipert <leipert@gitlab.com>

Merge branch 'security-no-version-ping-from-super-sidebar-16-5' into '16-5-stable-ee'

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

Changelog: security

Add the environment action to the CI JWT token fields

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Nikola Milojevic <nmilojevic@gitlab.com>
Approved-by: Ameya Darshan <adarshan@gitlab.com>
Co-authored-by: Timo Furrer <tfurrer@gitlab.com>

Merge branch 'security-ci-jwt-add-environment-action-16-5' into '16-5-stable-ee'

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

Changelog: security

Remove FIFO files from tarball extract

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: James Nutt <jnutt@gitlab.com>

Merge branch 'security-blocking-fifo-16-5' into '16-5-stable-ee'

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

Changelog: security

Backport add abuse detection for pipes

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Co-authored-by: John Mason <jmason@gitlab.com>

Merge branch 'security-jm-abusive-pipes-16-5' into '16-5-stable-ee'

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

Changelog: security

Prevent unprivileged user assignment in templated projects

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



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

Merge branch 'security-416244-user-swap-on-templated-project-16-5' into '16-5-stable-ee'

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

Changelog: security

Merge branch 'security-16-5-ms-fix-sd-email-template-issue-description-privileges' into '16-5-stable-ee'

Fixes Service Desk email template issue description privileges

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Felipe Artur <fcardozo@gitlab.com>
Co-authored-by: Marc Saleiko <msaleiko@gitlab.com>

Merge branch 'security-16-5-ms-fix-sd-email-template-issue-description-privileges' into '16-5-stable-ee'

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

Changelog: security

Downgrade vue-apollo to prevent auto-restarting subscriptions on error

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



Merged-by: Mark Florian <mflorian@gitlab.com>
Approved-by: Mark Florian <mflorian@gitlab.com>

Downgrade vue-apollo to prevent auto-restarting subscriptions on error

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



Merged-by: Mark Florian <mflorian@gitlab.com>
Approved-by: Mark Florian <mflorian@gitlab.com>
Reviewed-by: Mark Florian <mflorian@gitlab.com>
Co-authored-by: Lorenz van Herwaarden <lvanherwaarden@gitlab.com>

(cherry picked from commit c56aad40)

7de2ee18 Downgrade vue-apollo to prevent auto-restarting subscriptions on error

Update post migration to drop column only if it exists

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



Merged-by: Tiger Watson <twatson@gitlab.com>
Approved-by: Tiger Watson <twatson@gitlab.com>
Co-authored-by: Aakriti Gupta <agupta@gitlab.com>

Revert better-error-messages-for-pull-mirroring

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



Merged-by: Joe Woodward <jwoodward@gitlab.com>
Approved-by: Joe Woodward <jwoodward@gitlab.com>
Co-authored-by: Niklas <mc.taucher2003@gmail.com>

This reverts merge request !132854
Fixes https://gitlab.com/gitlab-org/gitlab/-/issues/428649 in 16.5 stable

Changelog: fixed

Changelog: other

[merge-train skip]

[ci skip]

[ci skip]

[merge-train skip]

Cherry-pick !134620 into 16.5 stable branch

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



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Kushal Pandya <kushal@gitlab.com>

Fixes flaky specs in email participants feature specs

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



Merged-by: Kushal Pandya <kushal@gitlab.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Marc Saleiko <msaleiko@gitlab.com>

(cherry picked from commit c316ecc6)

d10527b4 Fixes flaky specs in email participants feature specs

[merge-train skip]

Remove captureMessage Sentry calls

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



Merged-by: Florie Guibert <fguibert@gitlab.com>
Approved-by: Frédéric Caplette <fcaplette@gitlab.com>
Approved-by: Florie Guibert <fguibert@gitlab.com>
Co-authored-by: Miguel Rincon <mrincon@gitlab.com>

Complete rollout of new pipeline unlock mechanism

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



Merged-by: Albert Salim <asalim@gitlab.com>
Approved-by: drew stachon <730684-drew@users.noreply.gitlab.com>
Approved-by: Albert Salim <asalim@gitlab.com>
Co-authored-by: Erick Bajao <fbajao@gitlab.com>

This removes the feature flags to fully use the new unlock
mechanism.

This also enables the low rate of the unlock pipeline worker by default.

Changelog: other

Remove user dropdown from terms layout

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



Merged-by: Niko Belokolodov <nbelokolodov@gitlab.com>
Approved-by: Martin Čavoj <mcavoj@gitlab.com>
Approved-by: Kasia Misirli <kmisirli@gitlab.com>
Approved-by: Austin Regnery <aregnery@gitlab.com>
Approved-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Reviewed-by: Kasia Misirli <kmisirli@gitlab.com>
Reviewed-by: Martin Čavoj <mcavoj@gitlab.com>
Co-authored-by: Thomas Hutterer <thutterer@gitlab.com>
Co-authored-by: Austin Regnery <aregnery@gitlab.com>

These Bootstrap dropdowns are deprecated.
This instance here was not worth migrating because the user dropdown is
not needed in this layout.
It made sense to keep the avatar and add the username as title.
This way it is still clear which user is accepting the terms.

Changelog: changed

Drop index namespaces_on_ldap_sync_last_update_at

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



Merged-by: Matt Kasa <mkasa@gitlab.com>
Approved-by: Matt Kasa <mkasa@gitlab.com>
Co-authored-by: Prabakaran Murugesan <pmurugesan@gitlab.com>

Clean up bigint conversion for notes and related tables for self-managed

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



Merged-by: Leonardo da Rosa <ldarosa@gitlab.com>
Approved-by: Leonardo da Rosa <ldarosa@gitlab.com>
Reviewed-by: Krasimir Angelov <kangelov@gitlab.com>
Reviewed-by: Leonardo da Rosa <ldarosa@gitlab.com>
Co-authored-by: Krasimir Angelov <kangelov@gitlab.com>

Promote verify specs to reliable - Iteration 1

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



Merged-by: Andrejs Cunskis <acunskis@gitlab.com>
Approved-by: Andrejs Cunskis <acunskis@gitlab.com>
Approved-by: Andy Hohenner <ahohenner@gitlab.com>
Co-authored-by: hmuralidhar <hmuralidhar@gitlab.com>

Update authn group name and stage info

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



Merged-by: Ankit Panchal <apanchal@gitlab.com>
Approved-by: Ankit Panchal <apanchal@gitlab.com>
Co-authored-by: Adil Farrukh <afarrukh@gitlab.com>