Skip to content
Snippets Groups Projects
Commit 3fe7ee7a authored by Stan Hu's avatar Stan Hu
Browse files

Merge branch 'add-smtp-setting' into 'master'

Add SMTP as default delivery method to match 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 omnibus-gitlab!826.

Closes #19132

See merge request !4915
parents 88c9a057 21a1fc43
Branches
Tags
1 merge request!4915Add SMTP as default delivery method to match gitlab-org/omnibus-gitlab!826
Pipeline #
Loading
@@ -10,6 +10,7 @@
Loading
@@ -10,6 +10,7 @@
if Rails.env.production? if Rails.env.production?
Rails.application.config.action_mailer.delivery_method = :smtp Rails.application.config.action_mailer.delivery_method = :smtp
   
ActionMailer::Base.delivery_method = :smtp
ActionMailer::Base.smtp_settings = { ActionMailer::Base.smtp_settings = {
address: "email.server.com", address: "email.server.com",
port: 465, port: 465,
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment