Merge branch 'selhorn-sm-22' into 'master'

Updating to GitLab Self-Managed

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



Merged-by: Marcel Amirault <mamirault@gitlab.com>
Reviewed-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Suzanne Selhorn <sselhorn@gitlab.com>