Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b1e33591
Commit
b1e33591
authored
Jan 18, 2021
by
Anton Smith
Committed by
Marcin Sedlak-Jakubowski
Jan 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Incoming mail - Rename G Suite to Google Workspace
parent
9f243c48
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
doc/administration/incoming_email.md
doc/administration/incoming_email.md
+1
-1
doc/user/group/saml_sso/index.md
doc/user/group/saml_sso/index.md
+1
-1
No files found.
doc/administration/incoming_email.md
View file @
b1e33591
...
@@ -251,7 +251,7 @@ incoming_email:
...
@@ -251,7 +251,7 @@ incoming_email:
#### Gmail
#### Gmail
Example configuration for Gmail/G
Suit
e. Assumes mailbox
`gitlab-incoming@gmail.com`
.
Example configuration for Gmail/G
oogle Workspac
e. 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.
...
...
doc/user/group/saml_sso/index.md
View file @
b1e33591
...
@@ -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
Suit
e
](
https://support.google.com/a/answer/6087519?hl=en
)
-
[
G
oogle Workspac
e
](
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment