diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-03-09 19:23:43 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-03-09 19:23:43 +0300 |
| commit | 41913fcc096cfceb1b8245ffeffa471a668d1d20 (patch) | |
| tree | 7d1de5141013c561cbe1b79f1f316d9424f47608 /config | |
| parent | d6c13ec0b264b03ada4c7c5c39e3ba61165f5a74 (diff) | |
| parent | 890f14786a49cb715d8856c1a6917003649796c5 (diff) | |
Merge branch 'smtp_example_update' into 'master'
Add link to smtp documentation.
Closes #2070
See merge request !1627
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/smtp_settings.rb.sample | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample index e00923e7e0c..f0fe2fdfa43 100644 --- a/config/initializers/smtp_settings.rb.sample +++ b/config/initializers/smtp_settings.rb.sample @@ -3,6 +3,9 @@ # 2. Edit settings inside this file # 3. Restart GitLab instance # +# For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html +# + if Rails.env.production? Gitlab::Application.config.action_mailer.delivery_method = :smtp @@ -14,6 +17,6 @@ if Rails.env.production? domain: "gitlab.company.com", authentication: :login, enable_starttls_auto: true, - openssl_verify_mode: 'none' + openssl_verify_mode: 'peer' # See ActionMailer documentation for other possible options } end |