Skip to content

Restore Canonical -> Security mirroring

@gitlab-org/release/managers there were conflicts when the merge train attempted to merge canonical into security. To resolve the conflicts:

  • Identify the author and/or reviewer of the conflicting changes and ask them to fix the conflicts in this MR.
  • Disable the "Squash commits" setting.
  • If the pipeline is red and the failure is unrelated to the merge request, disable the Pipelines must succeed setting.
  • Request a review and get approval from AppSec on the MR if this has not already been done by the developers who fixed the conflict.
  • Merge the MR once it has been approved.
  • After merging, **restore the "Squash commits" and the "Pipelines must succeed" settings

See https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/how_to_sync_security_with_canonical.md for more details.

Edited by Dat Tang

Merge request reports