summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2016-11-11 15:40:19 +0100
committerMarin Jankovski <maxlazio@gmail.com>2016-11-16 12:46:37 +0100
commitaa9a289ce55d5099e6a65f25e7c3b38f66148aca (patch)
tree94b05fa1be35e175ee267690bcddab1425bdd1d7 /config
parent05be65f3731ebbe569c51a78ef72e30bf26aa8d0 (diff)
downloadgitlab-ce-aa9a289ce55d5099e6a65f25e7c3b38f66148aca.tar.gz
Make mail_room idle_timeout option configurable.
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
-rw-r--r--config/mail_room.yml2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 699ab6075b6..2da225904e1 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -138,6 +138,8 @@ production: &base
# The mailbox where incoming mail will end up. Usually "inbox".
mailbox: "inbox"
+ # The mailbox where incoming mail will end up. Usually "inbox".
+ idle_timeout: 60
## Build Artifacts
artifacts:
diff --git a/config/mail_room.yml b/config/mail_room.yml
index b026d510f1b..774c5350a45 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -15,7 +15,7 @@
:start_tls: <%= config[:start_tls].to_json %>
:email: <%= config[:user].to_json %>
:password: <%= config[:password].to_json %>
- :idle_timeout: 60
+ :idle_timeout: <%= config[:idle_timeout].to_json %>
:name: <%= config[:mailbox].to_json %>