What does this MR do?
EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14067
Are there points in the code the reviewer needs to double check?
Why was this MR needed?
The conflicts are really simple to resolve, but EE needs additional code to prevent Geo from breaking.
Screenshots (if relevant)
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated -
API support added -
Tests added for this feature/bug - Review
-
Has been reviewed by UX -
Has been reviewed by Frontend -
Has been reviewed by Backend -
Has been reviewed by Database
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Squashed related commits together