Fix conflict in Geo: Fix inconsistent project registry queries (!5294) · Merge requests · GitLab.org / GitLab · GitLab

Filipa Lacerda requested to merge 10-6-stable-ee-patch-4-5171-fix-conflict into 10-6-stable-ee-patch-4 Apr 09, 2018

Fix conflict when cherry-picking https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5171 into 10-6-stable-ee-patch-4