From c019b0acfd0c47693f89b320b6a8b9083a271f08 Mon Sep 17 00:00:00 2001
From: Effy Elden <github@effy.is>
Date: Fri, 14 Apr 2017 19:02:25 +1000
Subject: [PATCH] Modify ActionMailer configuration to default to
ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback,
config.x.local_domain, is undefined when the code is called. (#1745)
---
config/environments/production.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0b0ae29c8d..0f10765442 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -98,7 +98,7 @@ Rails.application.configure do
:address => ENV['SMTP_SERVER'],
:user_name => ENV['SMTP_LOGIN'],
:password => ENV['SMTP_PASSWORD'],
- :domain => ENV['SMTP_DOMAIN'] || config.x.local_domain,
+ :domain => ENV['SMTP_DOMAIN'] || ENV['LOCAL_DOMAIN'],
:authentication => ENV['SMTP_AUTH_METHOD'] || :plain,
:openssl_verify_mode => ENV['SMTP_OPENSSL_VERIFY_MODE'],
:enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
--
GitLab