diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-02 10:43:57 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-02 10:43:57 +0000 |
| commit | 8ec49e47ec7e8181ce4087f4b24008b0d07f7d9e (patch) | |
| tree | 0870383139318f771c1368df95c5bd4a3fb41f95 /config/initializers | |
| parent | c71c5876cbb66890c87de063982d671299c9dc8e (diff) | |
| parent | 84473c75134cb9d151c3a2e5f572b77f910573f7 (diff) | |
| download | gitlab-ce-8ec49e47ec7e8181ce4087f4b24008b0d07f7d9e.tar.gz | |
Merge branch 'mail-room-config-without-rails' into 'master'
Don't load all of GitLab in mail_room
Fixes #12731
cc @jacobvosmaer
See merge request !3005
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 713204b1c51..626268d7648 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -207,11 +207,7 @@ Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_c # 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['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? +Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled'].nil? # # Build Artifacts |