Merge remote-tracking branch 'github/master' into 'master'

c8b6ec47 · Robert Speicher · 7ea60fbf · d77c3cff · c8b6ec47
Commit c8b6ec47 authored Feb 09, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/initializers/smtp_settings.rb.sample config/initializers/smtp_settings.rb.sample +1 -1

No files found.
--- 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",