diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-04 18:09:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-04 18:09:55 +0000 |
| commit | ae42530b1be0d25186881ae45c39bdf1122a84b9 (patch) | |
| tree | 0592eb5b3b23d1dcd3b00bdb3b00f3b28412a291 /doc/user | |
| parent | e0655935eb32ba057b6ced978940076681d71177 (diff) | |
| download | gitlab-ce-ae42530b1be0d25186881ae45c39bdf1122a84b9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/group/saml_sso/index.md | 3 | ||||
| -rw-r--r-- | doc/user/project/canary_deployments.md | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md index df4e5ea091e..cc9145b9e7b 100644 --- a/doc/user/group/saml_sso/index.md +++ b/doc/user/group/saml_sso/index.md @@ -250,6 +250,9 @@ For example, to unlink the `MyOrg` account, the following **Disconnect** button ## Group Sync +<i class="fa fa-youtube-play youtube" aria-hidden="true"></i> +For a demo of Group Sync using Azure, see [Demo: SAML Group Sync](https://youtu.be/Iqvo2tJfXjg). + When the SAML response includes a user and their group memberships from the SAML identity provider, GitLab uses that information to automatically manage that user's GitLab group memberships. diff --git a/doc/user/project/canary_deployments.md b/doc/user/project/canary_deployments.md index c7985467b5c..f3bb12c8a63 100644 --- a/doc/user/project/canary_deployments.md +++ b/doc/user/project/canary_deployments.md @@ -68,9 +68,10 @@ can easily notice them.  -### Advanced traffic control with Canary Ingress **(PREMIUM)** +### Advanced traffic control with Canary Ingress -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/215501) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.6. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/215501) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.6. +> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/212320) to Core in GitLab 13.7. Canary deployments can be more strategic with [Canary Ingress](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#canary), which is an advanced traffic routing service that controls incoming HTTP |