Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2024-01-21 00:06:52 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2024-01-21 00:06:52 +0300
commit0d932b7e02b1d3618bf71012e20a33d7f2d282a6 (patch)
treebec9dd80b3e253a7f9ee739a70ec918e80d9dd55
parenteb4efc68a4569212049051a2dfb9a2e7cf8549a5 (diff)
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--doc/solutions/cloud/aws/gitlab_aws_integration.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/solutions/cloud/aws/gitlab_aws_integration.md b/doc/solutions/cloud/aws/gitlab_aws_integration.md
index fddb5ccfa38..90263385fc8 100644
--- a/doc/solutions/cloud/aws/gitlab_aws_integration.md
+++ b/doc/solutions/cloud/aws/gitlab_aws_integration.md
@@ -11,7 +11,7 @@ Learn how to integrate GitLab and AWS.
This content is intended for GitLab team members as well as members of the wider community.
-When content that is badged for GitLab SaaS ( **(SAAS)** ) or Self-Managed ( **(SELF)** ) it means that the link applies to only that type of GitLab instance implementation. Unbadged content works for any type of GitLab implementation.
+Unless otherwise noted, all of this content applies to both GitLab.com and self-managed instances.
This page attempts to index the ways in which GitLab can integrate with AWS. It does so whether the integration is the result of configuring general functionality, was built in to AWS or GitLab or is provided as a solution.
@@ -135,8 +135,8 @@ Top level groups on GitLab.com are also known as "Namespaces" and naming one aft
### User authentication and authorization between GitLab and AWS
-- [SAML SSO for GitLab.com groups](../../../user/group/saml_sso/index.md) `[GitLab Configuration]` **(SAAS)**
-- [Integrate LDAP with GitLab](../../../administration/auth/ldap/index.md) `[GitLab Configuration]` **(SELF)**
+- [SAML SSO for GitLab.com groups](../../../user/group/saml_sso/index.md) `[GitLab Configuration]` - GitLab.com only
+- [Integrate LDAP with GitLab](../../../administration/auth/ldap/index.md) `[GitLab Configuration]` - Self-managed only
### Runner workload authentication and authorization integration