CE upstream: Friday
Forgot to record the conflicting files, but the resolution is at https://gitlab.com/gitlab-org/gitlab-ee/commit/2c8e9ac18ee9563fe58129bbbc1037ff575c9287
Edited by Lin Jen-Shin
Forgot to record the conflicting files, but the resolution is at https://gitlab.com/gitlab-org/gitlab-ee/commit/2c8e9ac18ee9563fe58129bbbc1037ff575c9287