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 /config | |
| 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 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/mail_room.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 699ab6075b6..327e4a7937c 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 IDLE command timeout. + 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 %> |