Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-27 03:53:31 +0300
committerDouwe Maan <douwe@gitlab.com>2015-08-27 03:53:31 +0300
commit843694f90270e290f164bed68362500c9e331a46 (patch)
tree0e20cc09df536365db817ba8aef4c77d3d0c684e /app/mailers
parent6afd69f4445cc0688aa1695389eb3f79033e3121 (diff)
parentde3b7d9c522db8d129a64f2b86297cf90413cb1e (diff)
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
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}"