diff options
Diffstat (limited to 'app/workers/email_receiver_worker.rb')
| -rw-r--r-- | app/workers/email_receiver_worker.rb | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb index 321d492f0f3..54689df4d7b 100644 --- a/app/workers/email_receiver_worker.rb +++ b/app/workers/email_receiver_worker.rb @@ -90,37 +90,6 @@ class EmailReceiverWorker # rubocop:disable Scalability/IdempotentWorker def handle_failure(error) return unless raw.present? - can_retry = false - reason = - case error - when Gitlab::Email::UnknownIncomingEmail - s_("EmailError|We couldn't figure out what the email is for. Please create your issue or comment through the web interface.") - when Gitlab::Email::SentNotificationNotFoundError - s_("EmailError|We couldn't figure out what the email is in reply to. Please create your comment through the web interface.") - when Gitlab::Email::ProjectNotFound - s_("EmailError|We couldn't find the project. Please check if there's any typo.") - when Gitlab::Email::EmptyEmailError - can_retry = true - s_("EmailError|It appears that the email is blank. Make sure your reply is at the top of the email, we can't process inline replies.") - when Gitlab::Email::UserNotFoundError - s_("EmailError|We couldn't figure out what user corresponds to the email. Please create your comment through the web interface.") - when Gitlab::Email::UserBlockedError - s_("EmailError|Your account has been blocked. If you believe this is in error, contact a staff member.") - when Gitlab::Email::UserNotAuthorizedError - s_("EmailError|You are not allowed to perform this action. If you believe this is in error, contact a staff member.") - when Gitlab::Email::NoteableNotFoundError - s_("EmailError|The thread you are replying to no longer exists, perhaps it was deleted? If you believe this is in error, contact a staff member.") - when Gitlab::Email::InvalidAttachment - error.message - when Gitlab::Email::InvalidRecordError - can_retry = true - error.message - end - - if reason - receiver.mail.body = nil - - EmailRejectionMailer.rejection(reason, receiver.mail.encoded, can_retry).deliver_later - end + Gitlab::Email::FailureHandler.handle(receiver, error) end end |