Skip to content

Syncing master into gitlab-ce

GitLab Release Tools Bot requested to merge sync-canonical-with-security-changes into master

This MR was created either because there were merge conflicts when merging changes from the Security repository into the Canonical repository, or because pushing to master failed.

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

What should I do?

  1. Take a look at the conflicts, if any, 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