diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-09 12:14:19 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-09 12:14:19 -0500 |
| commit | c8b6ec47ade1c8685c085310d650fb9af1c44521 (patch) | |
| tree | 7df8a41c0cde29de39def47a524bb778a3f72ec0 | |
| parent | 7ea60fbfc872e5acc0cc444d442958990747c6b3 (diff) | |
| parent | d77c3cff364db4de257bd32ef60d370000d84709 (diff) | |
| download | gitlab-ce-c8b6ec47ade1c8685c085310d650fb9af1c44521.tar.gz | |
Merge remote-tracking branch 'github/master' into 'master'
| -rw-r--r-- | config/initializers/smtp_settings.rb.sample | 2 |
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", |