Commit 41913fcc authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'smtp_example_update' into 'master'

Add link to smtp documentation.

Closes #2070

See merge request !1627
parents d6c13ec0 890f1478
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
# 2. Edit settings inside this file # 2. Edit settings inside this file
# 3. Restart GitLab instance # 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? if Rails.env.production?
Gitlab::Application.config.action_mailer.delivery_method = :smtp Gitlab::Application.config.action_mailer.delivery_method = :smtp
...@@ -14,6 +17,6 @@ if Rails.env.production? ...@@ -14,6 +17,6 @@ if Rails.env.production?
domain: "gitlab.company.com", domain: "gitlab.company.com",
authentication: :login, authentication: :login,
enable_starttls_auto: true, enable_starttls_auto: true,
openssl_verify_mode: 'none' openssl_verify_mode: 'peer' # See ActionMailer documentation for other possible options
} }
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment