summaryrefslogtreecommitdiff
path: root/app/workers/email_receiver_worker.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-20 11:33:18 -0700
committerDouwe Maan <douwe@gitlab.com>2015-08-20 11:33:18 -0700
commit2f78b5e8afbf0024211bbd5bfe3a6c6f53b2421e (patch)
tree098f960816549cfb504bdcf590eee85f75d83f4f /app/workers/email_receiver_worker.rb
parent0b401f2e94c5062d26887cdeda73341c1aae82a5 (diff)
downloadgitlab-ce-2f78b5e8afbf0024211bbd5bfe3a6c6f53b2421e.tar.gz
Make error class names more consistent.
Diffstat (limited to 'app/workers/email_receiver_worker.rb')
-rw-r--r--app/workers/email_receiver_worker.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index 4f3556bfc03..8f6c27ce4af 100644
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@@ -22,7 +22,7 @@ class EmailReceiverWorker
reason = nil
case e
- when Gitlab::Email::Receiver::SentNotificationNotFound
+ when Gitlab::Email::Receiver::SentNotificationNotFoundError
reason = "We couldn't figure out what the email is in reply to. Please create your comment through the web interface."
when Gitlab::Email::Receiver::EmptyEmailError
can_retry = true
@@ -35,7 +35,7 @@ class EmailReceiverWorker
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::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::Email::Receiver::InvalidNote
+ when Gitlab::Email::Receiver::InvalidNoteError
can_retry = true
reason = e.message
else