summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-24 15:22:42 +0000
committerRémy Coutable <remy@rymai.me>2017-02-24 15:22:42 +0000
commit7fa802d286dfb5a032239fb00e0f3364e0d9f5ed (patch)
treebbe1f03f4b9a3fefb0d346ef50e0c2d0f8d27833 /doc/administration
parentc3d2ef73b5dcc6b318aea6c9f218ffed7d58dd41 (diff)
parent7f07d0d0215ef1b89b567832e2614c67e2a30daa (diff)
downloadgitlab-ce-7fa802d286dfb5a032239fb00e0f3364e0d9f5ed.tar.gz
Merge branch 'patch-1' into 'master'
Added application password instructions for Gmail/G suite accounts See merge request !9486
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/reply_by_email.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/administration/reply_by_email.md b/doc/administration/reply_by_email.md
index 00494e7e9d6..4f5c22e2d29 100644
--- a/doc/administration/reply_by_email.md
+++ b/doc/administration/reply_by_email.md
@@ -69,7 +69,9 @@ please consult [RFC 5322](https://tools.ietf.org/html/rfc5322#section-3.6.4).
If you want to use Gmail / Google Apps with Reply by email, make sure you have
[IMAP access enabled](https://support.google.com/mail/troubleshooter/1668960?hl=en#ts=1665018)
-and [allowed less secure apps to access the account](https://support.google.com/accounts/answer/6010255).
+and [allowed less secure apps to access the account](https://support.google.com/accounts/answer/6010255)
+or [turn-on 2-step validation](https://support.google.com/accounts/answer/185839)
+and use [an application password](https://support.google.com/mail/answer/185833).
To set up a basic Postfix mail server with IMAP access on Ubuntu, follow the
[Postfix setup documentation](reply_by_email_postfix_setup.md).