From 32bb42119527891bbc5cf3b86af8a75b8ac28ed6 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Thu, 14 Jul 2016 03:33:00 +0200
Subject: 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.
---
 config/mail_room.yml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config')

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 %>
 
-- 
cgit v1.2.1