Add optional bulk mailer settings (#35203)
This commit is contained in:
parent
bae258925c
commit
c357a7f8d6
11 changed files with 90 additions and 7 deletions
|
|
@ -110,7 +110,7 @@ Rails.application.configure do
|
|||
config.action_mailer.default_options[:reply_to] = config.x.email.reply_to if config.x.email.reply_to.present?
|
||||
config.action_mailer.default_options[:return_path] = config.x.email.return_path if config.x.email.return_path.present?
|
||||
|
||||
config.action_mailer.smtp_settings = Mastodon::EmailConfigurationHelper.smtp_settings(config.x.email.smtp_settings)
|
||||
config.action_mailer.smtp_settings = Mastodon::EmailConfigurationHelper.convert_smtp_settings(config.x.email.smtp_settings)
|
||||
|
||||
config.action_mailer.delivery_method = config.x.email.delivery_method.to_sym
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue