From 728f0c2005c85474b4c51eebcef850eb93855249 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Thu, 17 Oct 2013 15:41:02 +0200 Subject: [PATCH] Add smtp settings override in smtp_settings sample file. --- config/initializers/smtp_settings.rb.sample | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample index e62ad0f4b..9ebb1dde6 100644 --- a/config/initializers/smtp_settings.rb.sample +++ b/config/initializers/smtp_settings.rb.sample @@ -1,11 +1,11 @@ # To enable smtp email delivery for your GitLab instance do next: -# 1. Change config/environments/production.rb to use smtp -# config.action_mailer.delivery_method = :smtp -# 2. Rename this file to smtp_settings.rb -# 3. Edit settings inside this file -# 4. Restart GitLab instance +# 1. Rename this file to smtp_settings.rb +# 2. Edit settings inside this file +# 3. Restart GitLab instance # -if Gitlab::Application.config.action_mailer.delivery_method == :smtp +if Rails.env.production? do + Gitlab::Application.config.action_mailer.delivery_method = :smtp + ActionMailer::Base.smtp_settings = { address: "email.server.com", port: 456, -- 2.11.0