From 232157fa6eb90f4a9123363ab9804cdc29a3dcc7 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Thu, 18 Jul 2024 10:06:41 -0500 Subject: [PATCH] update enable_starttls_auto to true (#346) - in Rails 4.2, the true value and false values are checked. In Rails 5, only false values are checked - unless the values is nil or matches a false value, it is assumed to be true. - 'true' string no longer evaluates to true. default is true anyway so might as well set to true --- config/environments/production.rb | 2 +- config/environments/staging.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 3271d633..3516ebd0 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -15,7 +15,7 @@ config.active_record.raise_in_transactional_callbacks = true config.action_mailer.smtp_settings = { - enable_starttls_auto: ENV.fetch('MAILER_ENABLE_STARTTLS_AUTO', true), + enable_starttls_auto: true, address: ENV['MAILER_ADDRESS'], port: ENV.fetch('MAILER_PORT', 587).to_i, domain: ENV['MAILER_DOMAIN'] || 'zooniverse.org', diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 91d0d20e..6f64d0a5 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -15,7 +15,7 @@ config.active_record.raise_in_transactional_callbacks = true config.action_mailer.smtp_settings = { - enable_starttls_auto: ENV.fetch('MAILER_ENABLE_STARTTLS_AUTO', true), + enable_starttls_auto: true, address: ENV['MAILER_ADDRESS'], port: ENV.fetch('MAILER_PORT', 587).to_i, domain: ENV['MAILER_DOMAIN'] || 'zooniverse.org',