about summary refs log tree commit diff
path: root/config/environments
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-09-06 12:06:59 +0200
committerGitHub <noreply@github.com>2019-09-06 12:06:59 +0200
commit286bf110c3e69042049968440f1eb99372a7e0e6 (patch)
treeddf1c32803022cb200087a8c4c6818612ca76d3b /config/environments
parent0128509605ed90ee5a29d6af2347ab32bd46aeb9 (diff)
parent4434e2eb7f9942b44561c2f7702af3ed3854b8db (diff)
Merge pull request #1211 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/production.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ccf325bf2..00571a35a 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -83,7 +83,10 @@ Rails.application.configure do
   config.action_mailer.perform_caching = false
 
   # E-mails
-  config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost') }
+  config.action_mailer.default_options = {
+    from: ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost'),
+    reply_to: ENV['SMTP_REPLY_TO']
+  }
 
   config.action_mailer.smtp_settings = {
     :port                 => ENV['SMTP_PORT'],