tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2025-06-30 17:52:22 +02:00
2 parents bc3dacc371 c357a7f8d6
commit 2eec4da8fc
154 files changed
+1168 -826
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

config/environments/production.rb
+1 -1
View File
@@ -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