summaryrefslogtreecommitdiff
path: root/doc/incoming_email
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-24 15:15:25 +0200
committerDouwe Maan <douwe@gitlab.com>2015-09-24 15:15:25 +0200
commit477017722b4e3a9e3ab8e3c51608aedc9bf2f8d2 (patch)
tree308c654944d71329a64259e3a29872340be3165b /doc/incoming_email
parent29e0a43efe7c06d4c7ae52600beef79993744191 (diff)
downloadgitlab-ce-477017722b4e3a9e3ab8e3c51608aedc9bf2f8d2.tar.gz
Add and document option to use StartTLS with mail_room.
Diffstat (limited to 'doc/incoming_email')
-rw-r--r--doc/incoming_email/README.md4
1 files changed, 4 insertions, 0 deletions
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