diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2019-01-19 11:18:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-19 11:18:32 -0500 |
| commit | c2c10f9262ba00eb9b26632d8ee4b208627f88dd (patch) | |
| tree | 4cd7359dafbb5491576b69812c7e0d47731d13dc /actionmailbox/app | |
| parent | 9608b180bfb36cb459e4aa8d8116a065046e1915 (diff) | |
| parent | 88453093d5c74aad489feb34dc9062f55f258dd9 (diff) | |
| download | rails-c2c10f9262ba00eb9b26632d8ee4b208627f88dd.tar.gz rails-c2c10f9262ba00eb9b26632d8ee4b208627f88dd.tar.bz2 rails-c2c10f9262ba00eb9b26632d8ee4b208627f88dd.zip | |
Merge pull request #34984 from takeyuweb/fix-actionmailbox-create-inbound-emails
Fix that adding attachments lose a body
Diffstat (limited to 'actionmailbox/app')
| -rw-r--r-- | actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb | 2 |
1 files changed, 1 insertions, 1 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 2cde3db8a0..d051dfe665 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 @@ -22,7 +22,7 @@ module Rails def new_mail Mail.new(params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h).tap do |mail| params[:mail][:attachments].to_a.each do |attachment| - mail.attachments[attachment.original_filename] = { filename: attachment.path, content_type: attachment.content_type } + mail.add_file(filename: attachment.path, content: attachment.read) end end end |