The source project of this merge request has been removed.
Port of feature/#37403-clearer-email-handler to EE
What does this MR do?
Fix EE conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17501
Edited by Coung Ngo
Fix EE conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17501