diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-24 19:01:17 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-24 19:01:17 +0000 |
| commit | 3fe7ee7a197a211b2a3b2d0eb8b24fe019123dd9 (patch) | |
| tree | c5a857f88876d4bc82c3ad78611d09ed06186224 /config | |
| parent | 88c9a05771610b12e3853c1c414329442f6f166a (diff) | |
| parent | 21a1fc436fe81e4bcb2fdcad73cdf7e8105ae838 (diff) | |
| download | gitlab-ce-3fe7ee7a197a211b2a3b2d0eb8b24fe019123dd9.tar.gz | |
Merge branch 'add-smtp-setting' into 'master'
Add SMTP as default delivery method to match gitlab-org/omnibus-gitlab!826
Something happened after upgrading to 8.9RC5 that caused mail settings to be set to sendmail by default. gitlab-com/infrastructure#128 describes the issue in more detail. This MR mirrors the change in omnibus with gitlab-org/omnibus-gitlab!826.
Closes #19132
See merge request !4915
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/smtp_settings.rb.sample | 1 |
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, |