kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'smtp_example_update' into 'master'

Browse source 
Add link to smtp documentation.

Closes #2070

See merge request !1627
This commit is contained in:
Marin Jankovski 2015-03-09 16:23:43 +00:00
commit 41913fcc09
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/initializers/smtp_settings.rb.sample
View file

@ -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?
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