diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-21 06:22:41 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-21 06:22:41 +0000 |
| commit | 584117aa87cbb9c3bc4c43f962fa86bbdda04d25 (patch) | |
| tree | 2130828784dbfe9c8b1e8eb1ce116928ebbea373 | |
| parent | 5eadd14953b4b3385022fb688b7eeefbcf8a1769 (diff) | |
| parent | 728f0c2005c85474b4c51eebcef850eb93855249 (diff) | |
| download | gitlab-ce-584117aa87cbb9c3bc4c43f962fa86bbdda04d25.tar.gz | |
Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq
| -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, |