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.

Synced mail_room.yml with the one in omnibus
32bb4211 · Gabriel Mazetto · 3a93bae2 · 32bb4211
Commit 32bb4211 authored Jul 14, 2016 by Gabriel Mazetto
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

mail_room.yml config/mail_room.yml +4 -0

No files found.
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
+# 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 %>