Fixes conflict when picking into prep branch (!18900) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Filipa Lacerda requested to merge 10-8-stable-prepare-rc8-fix-conflict-for-18874 into 10-8-stable-prepare-rc8 May 11, 2018

Fixes conflict when piciking https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18874 into prep branch 10-8-stable-prepare-rc8