aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2018-12-14 10:14:48 -0500
committerGitHub <noreply@github.com>2018-12-14 10:14:48 -0500
commit51a148b552da152a539beea60dfe8a6bbd869c0e (patch)
treede27e856c0c5ee205ef3eef950a112bf8b5d0cad /app/controllers
parenta9653834aded0a31d82468e1e81d90c04b3500d4 (diff)
parentaf72d95883697fea79d5f1e76a90083a5f5a2b8a (diff)
downloadrails-51a148b552da152a539beea60dfe8a6bbd869c0e.tar.gz
rails-51a148b552da152a539beea60dfe8a6bbd869c0e.tar.bz2
rails-51a148b552da152a539beea60dfe8a6bbd869c0e.zip
Merge pull request #5 from kylekeesling/rails522-conductor-fix
Development conductor ingress does not work with Rails 5.2.2
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
index eb96d88691..059af0c302 100644
--- a/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
+++ b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
@@ -24,6 +24,6 @@ class Rails::Conductor::ActionMailbox::InboundEmailsController < Rails::Conducto
def create_inbound_email(mail)
ActionMailbox::InboundEmail.create! raw_email: \
- { io: StringIO.new(mail.to_s), filename: 'inbound.eml', content_type: 'message/rfc822', identify: false }
+ { io: StringIO.new(mail.to_s), filename: 'inbound.eml', content_type: 'message/rfc822' }
end
end