Depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24639.
Closes https://gitlab.com/charts/gitlab/issues/1110.