From 21a1fc436fe81e4bcb2fdcad73cdf7e8105ae838 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 24 Jun 2016 11:56:19 -0700
Subject: Add SMTP as default delivery method to match
 gitlab-org/omnibus-gitlab!826

Closes #19132

[ci skip]
---
 config/initializers/smtp_settings.rb.sample | 1 +
 1 file changed, 1 insertion(+)

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,
-- 
cgit v1.2.1