diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-20 11:05:06 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-20 11:05:06 -0700 |
| commit | e9972efc2f3d730e989907585dd1438c517a0bba (patch) | |
| tree | 7a38f9638cc50813d16d55f9276db98dd7cb041c /app | |
| parent | 3ff9d5c64cef8bf8daed5e253e388545987fb945 (diff) | |
| download | gitlab-ce-e9972efc2f3d730e989907585dd1438c517a0bba.tar.gz | |
Extract ReplyParser and AttachmentUploader from Receiver.
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/email_receiver_worker.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb index 2cfd64cefad..4f3556bfc03 100644 --- a/app/workers/email_receiver_worker.rb +++ b/app/workers/email_receiver_worker.rb @@ -7,7 +7,7 @@ class EmailReceiverWorker return unless Gitlab::ReplyByEmail.enabled? begin - Gitlab::EmailReceiver.new(raw).execute + Gitlab::Email::Receiver.new(raw).execute rescue => e handle_failure(raw, e) end @@ -22,20 +22,20 @@ class EmailReceiverWorker reason = nil case e - when Gitlab::EmailReceiver::SentNotificationNotFound + when Gitlab::Email::Receiver::SentNotificationNotFound reason = "We couldn't figure out what the email is in reply to. Please create your comment through the web interface." - when Gitlab::EmailReceiver::EmptyEmailError + when Gitlab::Email::Receiver::EmptyEmailError 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." - when Gitlab::EmailReceiver::AutoGeneratedEmailError + when Gitlab::Email::Receiver::AutoGeneratedEmailError reason = "The email was marked as 'auto generated', which we can't accept. Please create your comment through the web interface." - when Gitlab::EmailReceiver::UserNotFoundError + when Gitlab::Email::Receiver::UserNotFoundError reason = "We couldn't figure out what user corresponds to the email. Please create your comment through the web interface." - when Gitlab::EmailReceiver::UserNotAuthorizedError + when Gitlab::Email::Receiver::UserNotAuthorizedError reason = "You are not allowed to respond to the thread you are replying to. If you believe this is in error, contact a staff member." - when Gitlab::EmailReceiver::NoteableNotFoundError + when Gitlab::Email::Receiver::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." - when Gitlab::EmailReceiver::InvalidNote + when Gitlab::Email::Receiver::InvalidNote can_retry = true reason = e.message else |