aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2019-01-17 15:44:22 -0600
committerGitHub <noreply@github.com>2019-01-17 15:44:22 -0600
commitcc0dd1d371868fe34fba6b58d22a8ba0714d8ae7 (patch)
tree8f934195834677a30bf7b68f14170c0a636ad151 /actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
parent9d046eb553f79cf6a6664edd2be72e6131f927a9 (diff)
parent57cb8d7924195c770499e69ab90eb3b978035f46 (diff)
downloadrails-cc0dd1d371868fe34fba6b58d22a8ba0714d8ae7.tar.gz
rails-cc0dd1d371868fe34fba6b58d22a8ba0714d8ae7.tar.bz2
rails-cc0dd1d371868fe34fba6b58d22a8ba0714d8ae7.zip
Merge pull request #34967 from lifo/am-handle-duplicate-emails
Update test schema.rb to reflect the recent changes
Diffstat (limited to 'actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb')
-rw-r--r--actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
index 3537a983ef..2cde3db8a0 100644
--- a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
+++ b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
@@ -28,8 +28,7 @@ module Rails
end
def create_inbound_email(mail)
- ActionMailbox::InboundEmail.create! raw_email: \
- { io: StringIO.new(mail.to_s), filename: "inbound.eml", content_type: "message/rfc822" }
+ ActionMailbox::InboundEmail.create_and_extract_message_id!(mail.to_s)
end
end
end