Commit cc69bd07 authored by Lin Jen-Shin's avatar Lin Jen-Shin
parent 1f5d5590
...@@ -21,36 +21,35 @@ class EmailReceiverWorker ...@@ -21,36 +21,35 @@ class EmailReceiverWorker
return unless raw.present? return unless raw.present?
can_retry = false can_retry = false
reason = nil reason =
case e case e
when Gitlab::Email::UnknownIncomingEmail when Gitlab::Email::UnknownIncomingEmail
reason = "We couldn't figure out what the email is for." "We couldn't figure out what the email is for."
when Gitlab::Email::SentNotificationNotFoundError when Gitlab::Email::SentNotificationNotFoundError
reason = "We couldn't figure out what the email is in reply to. Please create your comment through the web interface." "We couldn't figure out what the email is in reply to. Please create your comment through the web interface."
when Gitlab::Email::ProjectNotFound when Gitlab::Email::ProjectNotFound
reason = "We couldn't find the project. Please check if there's any typo." "We couldn't find the project. Please check if there's any typo."
when Gitlab::Email::EmptyEmailError when Gitlab::Email::EmptyEmailError
can_retry = true can_retry = true
reason = "It appears that the email is blank. Make sure your reply is at the top of the email, we can't process inline replies." "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::AutoGeneratedEmailError when Gitlab::Email::AutoGeneratedEmailError
reason = "The email was marked as 'auto generated', which we can't accept. Please create your comment through the web interface." "The email was marked as 'auto generated', which we can't accept. Please create your comment through the web interface."
when Gitlab::Email::UserNotFoundError when Gitlab::Email::UserNotFoundError
reason = "We couldn't figure out what user corresponds to the email. Please create your comment through the web interface." "We couldn't figure out what user corresponds to the email. Please create your comment through the web interface."
when Gitlab::Email::UserBlockedError when Gitlab::Email::UserBlockedError
reason = "Your account has been blocked. If you believe this is in error, contact a staff member." "Your account has been blocked. If you believe this is in error, contact a staff member."
when Gitlab::Email::UserNotAuthorizedError when Gitlab::Email::UserNotAuthorizedError
reason = "You are not allowed to perform this action. If you believe this is in error, contact a staff member." "You are not allowed to perform this action. If you believe this is in error, contact a staff member."
when Gitlab::Email::NoteableNotFoundError when Gitlab::Email::NoteableNotFoundError
reason = "The thread you are replying to no longer exists, perhaps it was deleted? If you believe this is in error, contact a staff member." "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::InvalidNoteError, when Gitlab::Email::InvalidNoteError,
Gitlab::Email::InvalidIssueError Gitlab::Email::InvalidIssueError
can_retry = true can_retry = true
reason = e.message e.message
else
return
end end
if reason
EmailRejectionMailer.rejection(reason, raw, can_retry).deliver_later EmailRejectionMailer.rejection(reason, raw, can_retry).deliver_later
end end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment