diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-09 17:25:31 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-11-09 17:25:31 +0000 |
| commit | b740bfc218bc09a02abf3536fe9998caed31bb1a (patch) | |
| tree | 41c6d365a7c861cb557f8f1979bc116992801284 /config | |
| parent | 62769e2050efebec3beb1f1ddaa65d77e7182aaf (diff) | |
| parent | 0fb85939da482e50a7337d8762fb26e75bb16ce5 (diff) | |
| download | gitlab-ce-b740bfc218bc09a02abf3536fe9998caed31bb1a.tar.gz | |
Merge branch 'fix-incoming-email-default' into 'master'
Fix incoming email config defaults
Fixes #3377.
See merge request !1766
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 64d73d7232d..8192d727f2a 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -193,8 +193,8 @@ Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_c Settings['incoming_email'] ||= Settingslogic.new({}) Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled'].nil? Settings.incoming_email['port'] = 143 if Settings.incoming_email['port'].nil? -Settings.incoming_email['ssl'] = 143 if Settings.incoming_email['ssl'].nil? -Settings.incoming_email['start_tls'] = 143 if Settings.incoming_email['start_tls'].nil? +Settings.incoming_email['ssl'] = false if Settings.incoming_email['ssl'].nil? +Settings.incoming_email['start_tls'] = false if Settings.incoming_email['start_tls'].nil? Settings.incoming_email['mailbox'] = "inbox" if Settings.incoming_email['mailbox'].nil? # |