summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-06-24 11:56:19 -0700
committerStan Hu <stanhu@gmail.com>2016-06-24 11:56:52 -0700
commit21a1fc436fe81e4bcb2fdcad73cdf7e8105ae838 (patch)
tree92581ba9a80c9cc1c46b3e1491130d4bd417b5d1
parent0372afe22ae6e48a85da37d02f6ba740f202b35d (diff)
downloadgitlab-ce-21a1fc436fe81e4bcb2fdcad73cdf7e8105ae838.tar.gz
Add SMTP as default delivery method to match gitlab-org/omnibus-gitlab!826
Closes #19132 [ci skip]
-rw-r--r--config/initializers/smtp_settings.rb.sample1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
index 2287a76fca7..bd37080b1c8 100644
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
@@ -10,6 +10,7 @@
if Rails.env.production?
Rails.application.config.action_mailer.delivery_method = :smtp
+ ActionMailer::Base.delivery_method = :smtp
ActionMailer::Base.smtp_settings = {
address: "email.server.com",
port: 465,