summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-13 13:07:59 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-13 13:10:49 +0200
commit712d17684b2b9a8664cdff685c44fa59ea6fabbc (patch)
tree34cef23c0e546db66fc3aed820e5129547a8b751 /config/initializers
parentc2c8f8acc41747280356e157e749c1cafbd807e3 (diff)
downloadgitlab-ce-712d17684b2b9a8664cdff685c44fa59ea6fabbc.tar.gz
Make Reply by email easier to configure
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/1_settings.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 4c78bd6e2fa..f04263c760b 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -187,7 +187,9 @@ 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['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?
#
# Gravatar