diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-17 12:10:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-17 12:10:25 +0000 |
| commit | 775cc997849359e703c200b1c6528cd56c591652 (patch) | |
| tree | 213bb0339b2f030dbacb279a3c9199c109e591c4 /lib | |
| parent | bc15f6fb5b5bf4a92238f4a12a63968cb4dc8460 (diff) | |
| parent | c61a9b0f1a12972dd3c2ae4e968c11c72ced6756 (diff) | |
| download | gitlab-ce-775cc997849359e703c200b1c6528cd56c591652.tar.gz | |
Merge branch 'mailroom_idle_timeout' into 'master'
Allows configuration of idle_timeout for incoming email.
https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1087
See merge request !7423
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/mail_room.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/mail_room.rb b/lib/gitlab/mail_room.rb index a5220d92312..3503fac40e8 100644 --- a/lib/gitlab/mail_room.rb +++ b/lib/gitlab/mail_room.rb @@ -31,6 +31,7 @@ module Gitlab config[:ssl] = false if config[:ssl].nil? config[:start_tls] = false if config[:start_tls].nil? config[:mailbox] = 'inbox' if config[:mailbox].nil? + config[:idle_timeout] = 60 if config[:idle_timeout].nil? if config[:enabled] && config[:address] gitlab_redis = Gitlab::Redis.new(rails_env) |