diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-14 07:21:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-14 07:21:15 +0000 |
| commit | 613aa1cb87ee1000cb08bd15db1b62eae64f19dd (patch) | |
| tree | ad7c2b3a29f922b88b80a4aef6611849af031cd1 | |
| parent | 712d17684b2b9a8664cdff685c44fa59ea6fabbc (diff) | |
| download | gitlab-ce-incoming-email-config.tar.gz | |
Add defaults for incoming_email ssl and start_tls.incoming-email-config
| -rw-r--r-- | config/initializers/1_settings.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index f04263c760b..432bf026ba2 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -187,9 +187,11 @@ Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_ci[ # Reply by email # 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['mailbox'] = "inbox" if Settings.incoming_email['mailbox'].nil? +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['mailbox'] = "inbox" if Settings.incoming_email['mailbox'].nil? # # Gravatar @@ -267,4 +269,4 @@ if Rails.env.test? Settings.gitlab['default_projects_limit'] = 42 Settings.gitlab['default_can_create_group'] = true Settings.gitlab['default_can_create_team'] = false -end +end
\ No newline at end of file |