summaryrefslogtreecommitdiff
path: root/config/mail_room.yml
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-07-14 03:33:00 +0200
committerGabriel Mazetto <gabriel@gitlab.com>2016-08-04 18:55:37 +0200
commit32bb42119527891bbc5cf3b86af8a75b8ac28ed6 (patch)
tree0eed2d7f6182ef97dcc06e556c2eb0084524e52d /config/mail_room.yml
parent3a93bae25f03a2992401e1de5bfbf52c3921b1a4 (diff)
downloadgitlab-ce-32bb42119527891bbc5cf3b86af8a75b8ac28ed6.tar.gz
Synced mail_room.yml with the one in omnibus
Added a comment to remember developers to open merge request to omnibus in future changes of the file.
Diffstat (limited to 'config/mail_room.yml')
-rw-r--r--config/mail_room.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/mail_room.yml b/config/mail_room.yml
index febd5f7c1f1..c639f8260aa 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -1,3 +1,6 @@
+# If you change this file in a Merge Request, please also create
+# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+#
:mailboxes:
<%
require_relative "lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
@@ -12,6 +15,7 @@
:start_tls: <%= config[:start_tls].to_json %>
:email: <%= config[:user].to_json %>
:password: <%= config[:password].to_json %>
+ :idle_timeout: 60
:name: <%= config[:mailbox].to_json %>