-
Oswaldo Ferreira authored
This was ported from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23474 in order to avoid conflicts.
aea75a3b
This was ported from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23474 in order to avoid conflicts.