Fixes conflicts when picking `Resolve "gitlab 10.8 assumes that installation is a git working copy."` into `10-8-stable-patch-3` (!19239) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Filipa Lacerda requested to merge 10-8-stable-patch-3-fix-conflicts-19125 into 10-8-stable-patch-3 May 30, 2018

Fixes conflicts when picking Resolve "gitlab 10.8 assumes that installation is a git working copy." - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19125 into 10-8-stable-patch-3 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19223