diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-03-31 22:18:30 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-05-16 21:27:16 +0000 |
| commit | 034e752aa4dc31442437af08cc6b630f940b6802 (patch) | |
| tree | 2b1edb969a61a40a932e0dbeb94aeefe0db954cf /app/workers/email_receiver_worker.rb | |
| parent | 87ff0107c15c06dc6e48c7c304e3ffe7e2629684 (diff) | |
| download | gitlab-ce-034e752aa4dc31442437af08cc6b630f940b6802.tar.gz | |
Handle InvalidIssueError as InvalidNoteError
Diffstat (limited to 'app/workers/email_receiver_worker.rb')
| -rw-r--r-- | app/workers/email_receiver_worker.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb index f2649e38eb3..95469f1c486 100644 --- a/app/workers/email_receiver_worker.rb +++ b/app/workers/email_receiver_worker.rb @@ -39,7 +39,8 @@ 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::InvalidNoteError + when Gitlab::Email::Receiver::InvalidNoteError, + Gitlab::Email::Receiver::InvalidIssueError can_retry = true reason = e.message else |