diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2013-10-17 15:41:02 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2013-10-18 09:49:55 +0200 |
| commit | 728f0c2005c85474b4c51eebcef850eb93855249 (patch) | |
| tree | a959d555be8b0c0e2dc80a99d5cac951cfea3374 /config/initializers | |
| parent | 318f96a40d8b657494bc5b8008c02e8cc0162fd4 (diff) | |
| download | gitlab-ce-728f0c2005c85474b4c51eebcef850eb93855249.tar.gz | |
Add smtp settings override in smtp_settings sample file.
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/smtp_settings.rb.sample | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample index e62ad0f4b71..9ebb1dde6f9 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, |