Closes: https://gitlab.com/charts/gitlab/issues/1218
Depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26217/