Skip to content

Syncing rp/security-sync-test2 into gitlab-ee

Reuben Pereira requested to merge sync-canonical-with-security-changes into rp/security-sync-test2

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

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.

Merge request reports