Merge branch 'update_smtp_example' into 'master'

Update smtp example to add openssl_verify_mode See merge request !1478

Merge branch 'update_smtp_example' into 'master'
07715ce5 · Dmitriy Zaporozhets · bc57ff0e · 631bbe50 · 07715ce5
Commit 07715ce5 authored Feb 06, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

smtp_settings.rb.sample config/initializers/smtp_settings.rb.sample +3 -2

No files found.
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
-# To enable smtp email delivery for your GitLab instance do next: 
+# To enable smtp email delivery for your GitLab instance do the following:
 # 1. Rename this file to smtp_settings.rb
 # 2. Edit settings inside this file
 # 3. Restart GitLab instance
@@ -13,6 +13,7 @@ if Rails.env.production?
    password: "123456",
    domain: "gitlab.company.com",
    authentication: :login,
-    enable_starttls_auto: true
+    enable_starttls_auto: true,
+    openssl_verify_mode: 'none'
  }
 end