From 477017722b4e3a9e3ab8e3c51608aedc9bf2f8d2 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 24 Sep 2015 15:15:25 +0200
Subject: [PATCH] Add and document option to use StartTLS with mail_room.
---
config/mail_room.yml.example | 2 ++
doc/incoming_email/README.md | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example
index dd8edfc42eb..82e1a42058e 100644
--- a/config/mail_room.yml.example
+++ b/config/mail_room.yml.example
@@ -6,6 +6,8 @@
# :port: 993
# # Whether the IMAP server uses SSL
# :ssl: true
+ # # Whether the IMAP server uses StartTLS
+ # :start_tls: false
# # Email account username. Usually the full email address.
# :email: "replies@gitlab.example.com"
# # Email account password
diff --git a/doc/incoming_email/README.md b/doc/incoming_email/README.md
index c94e25bd4cc..01ab22321ed 100644
--- a/doc/incoming_email/README.md
+++ b/doc/incoming_email/README.md
@@ -88,6 +88,8 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
:port: 993
# Whether the IMAP server uses SSL
:ssl: true
+ # Whether the IMAP server uses StartTLS
+ :start_tls: false
# Email account username. Usually the full email address.
:email: "gitlab-incoming@gmail.com"
# Email account password
@@ -161,6 +163,8 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
:port: 993
# Whether the IMAP server uses SSL
:ssl: true
+ # Whether the IMAP server uses StartTLS
+ :start_tls: false
# Email account username. Usually the full email address.
:email: "gitlab-incoming@gmail.com"
# Email account password
--
GitLab