diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-24 15:15:25 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-24 15:15:25 +0200 |
| commit | 477017722b4e3a9e3ab8e3c51608aedc9bf2f8d2 (patch) | |
| tree | 308c654944d71329a64259e3a29872340be3165b | |
| parent | 29e0a43efe7c06d4c7ae52600beef79993744191 (diff) | |
| download | gitlab-ce-477017722b4e3a9e3ab8e3c51608aedc9bf2f8d2.tar.gz | |
Add and document option to use StartTLS with mail_room.
| -rw-r--r-- | config/mail_room.yml.example | 2 | ||||
| -rw-r--r-- | doc/incoming_email/README.md | 4 |
2 files changed, 6 insertions, 0 deletions
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 |