Commit 8f1c581d authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski

Merge branch 'docs/incoming_mail-rename-g-suite' into 'master'

Incoming mail - Rename G Suite to Google Workspace

See merge request gitlab-org/gitlab!51837
parents 1f86c0b0 b1e33591
...@@ -251,7 +251,7 @@ incoming_email: ...@@ -251,7 +251,7 @@ incoming_email:
#### Gmail #### Gmail
Example configuration for Gmail/G Suite. Assumes mailbox `gitlab-incoming@gmail.com`. Example configuration for Gmail/Google Workspace. Assumes mailbox `gitlab-incoming@gmail.com`.
NOTE: NOTE:
`incoming_email_email` cannot be a Gmail alias account. `incoming_email_email` cannot be a Gmail alias account.
......
...@@ -169,7 +169,7 @@ Your identity provider may have relevant documentation. It may be generic SAML d ...@@ -169,7 +169,7 @@ Your identity provider may have relevant documentation. It may be generic SAML d
- [ADFS (Active Directory Federation Services)](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/create-a-relying-party-trust) - [ADFS (Active Directory Federation Services)](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/create-a-relying-party-trust)
- [Auth0](https://auth0.com/docs/protocols/saml-configuration-options/configure-auth0-as-saml-identity-provider) - [Auth0](https://auth0.com/docs/protocols/saml-configuration-options/configure-auth0-as-saml-identity-provider)
- [G Suite](https://support.google.com/a/answer/6087519?hl=en) - [Google Workspace](https://support.google.com/a/answer/6087519?hl=en)
- [JumpCloud](https://support.jumpcloud.com/support/s/article/single-sign-on-sso-with-gitlab-2019-08-21-10-36-47) - [JumpCloud](https://support.jumpcloud.com/support/s/article/single-sign-on-sso-with-gitlab-2019-08-21-10-36-47)
- [PingOne by Ping Identity](https://docs.pingidentity.com/bundle/pingone/page/xsh1564020480660-1.html) - [PingOne by Ping Identity](https://docs.pingidentity.com/bundle/pingone/page/xsh1564020480660-1.html)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment