home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2013-10-21 06:22:41 +00:00
parent 5eadd14953 728f0c2005
commit 584117aa87
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/initializers/smtp_settings.rb.sample
+6 -6
View File
@@ -1,11 +1,11 @@
# To enable smtp email delivery for your GitLab instance do next:
# 1. Change config/environments/production.rb to use smtp
# config.action_mailer.delivery_method = :smtp
# 2. Rename this file to smtp_settings.rb
# 3. Edit settings inside this file
# 4. Restart GitLab instance
# 1. Rename this file to smtp_settings.rb
# 2. Edit settings inside this file
# 3. Restart GitLab instance
#
if Gitlab::Application.config.action_mailer.delivery_method == :smtp
if Rails.env.production? do
Gitlab::Application.config.action_mailer.delivery_method = :smtp
ActionMailer::Base.smtp_settings = {
address: "email.server.com",
port: 456,