Fix conflicts for Resolve "[Geo] Log JID for sync related jobs" (!5295) · Merge requests · GitLab.org / GitLab · GitLab

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

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