Resolve EE merge conflict (!6239) · Merge requests · GitLab.org / GitLab · GitLab

Zeger-Jan van de Weg requested to merge zj-repository-size-ee into master Jun 22, 2018

CE counterpart: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20089