a1e1e72375
Use a Message-ID that is RFC 2111 compliant. This fix is consistent with how the Message-ID is generated in the 'notify' mailer.
21 lines
623 B
Ruby
21 lines
623 B
Ruby
class EmailRejectionMailer < BaseMailer
|
|
def rejection(reason, original_raw, can_retry = false)
|
|
@reason = reason
|
|
@original_message = Mail::Message.new(original_raw)
|
|
|
|
return unless @original_message.from
|
|
|
|
headers = {
|
|
to: @original_message.from,
|
|
subject: "[Rejected] #{@original_message.subject}"
|
|
}
|
|
|
|
headers['Message-ID'] = "<#{SecureRandom.hex}@#{Gitlab.config.gitlab.host}>"
|
|
headers['In-Reply-To'] = @original_message.message_id
|
|
headers['References'] = @original_message.message_id
|
|
|
|
headers['Reply-To'] = @original_message.to.first if can_retry
|
|
|
|
mail(headers)
|
|
end
|
|
end
|