diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/auth/ldap-ee.md | 21 | ||||
| -rw-r--r-- | doc/administration/gitaly/img/gitlab_gitaly_version_mismatch_v12_4.png | bin | 0 -> 21779 bytes | |||
| -rw-r--r-- | doc/administration/gitaly/index.md | 8 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 13 | ||||
| -rw-r--r-- | doc/user/group/saml_sso/index.md | 19 |
5 files changed, 53 insertions, 8 deletions
diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index b1d4c8e4298..ba104a4c574 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -110,12 +110,23 @@ following. 1. [Restart GitLab][restart] for the changes to take effect. -To take advantage of group sync, group owners or maintainers will need to create an -LDAP group link in their group **Settings > LDAP Groups** page. +To take advantage of group sync, group owners or maintainers will need to [create one +or more LDAP group links](#adding-group-links). -Multiple LDAP groups and [filters](#filters-premium-only) can be linked with -a single GitLab group. When the link is created, an access level/role is -specified (Guest, Reporter, Developer, Maintainer, or Owner). +### Adding group links + +Once [group sync has been configured](#group-sync) on the instance, one or more LDAP +groups can be linked to a GitLab group to grant their members access to its +contents. + +Group owners or maintainers can add and use LDAP group links by: + +1. Navigating to the group's **Settings > LDAP Synchronization** page. Here, one or more + LDAP groups and [filters](#filters-premium-only) can be linked to this GitLab group, + each one with a configured [permission level](../../user/permissions.md#group-members-permissions) + for its members. +1. Updating the group's membership by navigating to the group's **Settings > Members** + page and clicking **Sync now**. ### Filters **(PREMIUM ONLY)** diff --git a/doc/administration/gitaly/img/gitlab_gitaly_version_mismatch_v12_4.png b/doc/administration/gitaly/img/gitlab_gitaly_version_mismatch_v12_4.png Binary files differnew file mode 100644 index 00000000000..4d2c5cdb00c --- /dev/null +++ b/doc/administration/gitaly/img/gitlab_gitaly_version_mismatch_v12_4.png diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md index 40e7a8d4da2..314f5aad82e 100644 --- a/doc/administration/gitaly/index.md +++ b/doc/administration/gitaly/index.md @@ -718,6 +718,14 @@ Note that `enforced="true"`, meaning that authentication is being enforced. ## Troubleshooting Gitaly +### Checking versions when using standalone Gitaly nodes + +When using standalone Gitaly nodes, you must make sure they are the same version +as GitLab to ensure full compatibility. Check **Admin Area > Gitaly Servers** on +your GitLab instance and confirm all Gitaly Servers are `Up to date`. + + + ### `gitaly-debug` The `gitaly-debug` command provides "production debugging" tools for Gitaly and Git diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 93549ac4de5..f386c5ae42a 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -766,10 +766,17 @@ or a `.buildpacks` file in your project: and add the URL of the buildpack to use on a line in the file. If you want to use multiple buildpacks, you can enter them in, one on each line. -CAUTION: **Caution:** -Using multiple buildpacks isn't yet supported by Auto DevOps. +#### Multiple buildpacks + +Using multiple buildpacks isn't fully supported by Auto DevOps because, when using the `.buildpacks` +file, Auto Test will not work. + +The buildpack [heroku-buildpack-multi](https://github.com/heroku/heroku-buildpack-multi/), +which is used under the hood to parse the `.buildpacks` file, doesn't provide the necessary commands +`bin/test-compile` and `bin/test`. -CAUTION: **Caution:** When using the `.buildpacks` file, Auto Test will not work. The buildpack [heroku-buildpack-multi](https://github.com/heroku/heroku-buildpack-multi/) (which is used under the hood to parse the `.buildpacks` file) doesn't provide the necessary commands `bin/test-compile` and `bin/test`. Make sure to provide the project variable `BUILDPACK_URL` instead. +If your goal is to use only a single custom buildpack, you should provide the project variable +`BUILDPACK_URL` instead. ### Custom `Dockerfile` diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md index 6fd56414796..fef47fba3a1 100644 --- a/doc/user/group/saml_sso/index.md +++ b/doc/user/group/saml_sso/index.md @@ -123,6 +123,25 @@ NOTE: **Note:** GitLab is unable to provide support for IdPs that are not listed When [configuring your identify provider](#configuring-your-identity-provider), please consider the notes below for specific providers to help avoid common issues and as a guide for terminology used. +### Azure setup notes + +<i class="fa fa-youtube-play youtube" aria-hidden="true"></i> +For a demo of the Azure SAML setup including SCIM, see [SCIM Provisioning on Azure Using SAML SSO for Groups Demo](https://youtu.be/24-ZxmTeEBU). + +| GitLab Setting | Azure Field | +|--------------|----------------| +| Identifier | Identifier (Entity ID) | +| Assertion consumer service URL | Reply URL (Assertion Consumer Service URL) | +| Identity provider single sign on URL | Login URL | +| Certificate fingerprint | Thumbprint | + +We recommend: + +- **Unique User Identifier (Name identifier)** set to `user.objectID`. +- **nameid-format** set to persistent. + +Set other user attributes and claims according to the [assertions table](#assertions). + ### Okta setup notes | GitLab Setting | Okta Field | |
