summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <me@douwe.me>2016-02-09 17:22:47 +0100
committerDouwe Maan <me@douwe.me>2016-02-09 17:22:47 +0100
commitd77c3cff364db4de257bd32ef60d370000d84709 (patch)
tree0a4e55cf2a4cc5c96b2e743c6029f3c5ee4eb93f /config
parent706b101f510b9a1f5acff51bb2f1b14c018b37ce (diff)
parente080fdad6ebddfda8e78f3fc1e553206a1fbd6c7 (diff)
downloadgitlab-ce-d77c3cff364db4de257bd32ef60d370000d84709.tar.gz
Merge pull request #10023 from bozaro/smtp-port
Change default smpt port to 465 (default smtps port)
Diffstat (limited to 'config')
-rw-r--r--config/initializers/smtp_settings.rb.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
index ec182502d4e..2287a76fca7 100644
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
@@ -12,7 +12,7 @@ if Rails.env.production?
ActionMailer::Base.smtp_settings = {
address: "email.server.com",
- port: 456,
+ port: 465,
user_name: "smtp",
password: "123456",
domain: "gitlab.company.com",