diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-21 20:14:45 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-21 20:14:45 +0300 |
| commit | 69708dab9f6e1c265dd2bf80eafc39bf68c356e0 (patch) | |
| tree | 08ebea572ea31c46d77fdc7c24f729325279a25f /app/workers | |
| parent | 35224d5e7f3e0c978640b7a6dd64e9778c4d1c60 (diff) | |
Block blocked users from replying to threads by email.
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/email_receiver_worker.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb index 8f6c27ce4af..a588a1f45ee 100644 --- a/app/workers/email_receiver_worker.rb +++ b/app/workers/email_receiver_worker.rb @@ -31,6 +31,8 @@ class EmailReceiverWorker reason = "The email was marked as 'auto generated', which we can't accept. Please create your comment through the web interface." 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::Email::Receiver::UserBlockedError + reason = "Your account has been blocked. If you believe this is in error, contact a staff member." 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::Email::Receiver::NoteableNotFoundError |