diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-07 19:59:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-10-07 19:59:57 +0000 |
| commit | c670f0736648a4dbd558d2f41eea33f773dee3a6 (patch) | |
| tree | f6160bcd25ca4f1b92c1e1be4f912389ad94d317 /config | |
| parent | 1f11096c17ac1ea1bd9b62d661795e32af854e48 (diff) | |
| parent | f9aab3fb586614dc21fa799a5088dc53acd43215 (diff) | |
| download | gitlab-ce-c670f0736648a4dbd558d2f41eea33f773dee3a6.tar.gz | |
Merge branch 'clarify-postfix' into 'master'
Clarify Reply by email settings when using Postfix mail server
Fixes #2902.
[ci skip]
See merge request !1528
Diffstat (limited to 'config')
| -rw-r--r-- | config/mail_room.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example index 82e1a42058e..ed4a5193a6a 100644 --- a/config/mail_room.yml.example +++ b/config/mail_room.yml.example @@ -9,7 +9,7 @@ # # Whether the IMAP server uses StartTLS # :start_tls: false # # Email account username. Usually the full email address. - # :email: "replies@gitlab.example.com" + # :email: "gitlab-incoming@gmail.com" # # Email account password # :password: "password" # # The name of the mailbox where incoming mail will end up. Usually "inbox". |