Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2016-11-11 17:40:19 +0300
committerMarin Jankovski <maxlazio@gmail.com>2016-11-16 14:46:37 +0300
commitaa9a289ce55d5099e6a65f25e7c3b38f66148aca (patch)
tree94b05fa1be35e175ee267690bcddab1425bdd1d7 /lib/gitlab/mail_room.rb
parent05be65f3731ebbe569c51a78ef72e30bf26aa8d0 (diff)
Make mail_room idle_timeout option configurable.
Diffstat (limited to 'lib/gitlab/mail_room.rb')
-rw-r--r--lib/gitlab/mail_room.rb1
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)