Skip to content

Syncing 15-11-stable-ee from security into gitlab-ee

Steve Abrams requested to merge merge-15-11-stable-ee into 15-11-stable-ee

This MR was created because there were merge conflicts when merging changes from the Security repository into the Canonical repository.

The source branch contains changes from the Security repository that need to be merged into Canonical.

These changes were all reviewed and approved as part of the security release process in https://gitlab.com/gitlab-org/gitlab/-/issues/403569

What should I do?

  1. Take a look at the conflicts and attempt to solve them.
  2. Use the dev-on-call process if you're not sure how to solve the conflicts.
  3. Merge this MR.
Edited by Steve Abrams

Merge request reports