summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-24 10:57:35 -0700
committerDouwe Maan <douwe@gitlab.com>2015-08-24 10:57:35 -0700
commit208888038375d48cc91cf481a3f8509d63d8e1ad (patch)
treeab3399fbda238d4763aa999e3919e59f07860a4f /app/mailers
parente449426a4e7d15cdd582d4f136add52cbfb5e04e (diff)
downloadgitlab-ce-208888038375d48cc91cf481a3f8509d63d8e1ad.tar.gz
Ignore empty incoming messages.
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/email_rejection_mailer.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/mailers/email_rejection_mailer.rb b/app/mailers/email_rejection_mailer.rb
index 89aceda82d1..883f1c73ad4 100644
--- a/app/mailers/email_rejection_mailer.rb
+++ b/app/mailers/email_rejection_mailer.rb
@@ -3,6 +3,8 @@ class EmailRejectionMailer < BaseMailer
@reason = reason
@original_message = Mail::Message.new(original_raw)
+ return unless @original_message.from
+
headers = {
to: @original_message.from,
subject: "[Rejected] #{@original_message.subject}"