diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-06 17:54:00 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-06 17:54:00 +0000 |
| commit | 07715ce5d5eca8da99e942e80de42c268ab363bd (patch) | |
| tree | b60f449371a7ce3c28b1fea6c2f87c38499a29c0 | |
| parent | bc57ff0ef023db3d07f1adfa6a309fb4a24ed203 (diff) | |
| parent | 631bbe50ff1e389fd587b15f33cda399938914f3 (diff) | |
| download | gitlab-ce-07715ce5d5eca8da99e942e80de42c268ab363bd.tar.gz | |
Merge branch 'update_smtp_example' into 'master'
Update smtp example to add openssl_verify_mode
See merge request !1478
| -rw-r--r-- | config/initializers/smtp_settings.rb.sample | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample index 3711b03796e..e00923e7e0c 100644 --- a/config/initializers/smtp_settings.rb.sample +++ b/config/initializers/smtp_settings.rb.sample @@ -1,4 +1,4 @@ -# 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 |