diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 06:09:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 06:09:31 +0300 |
| commit | e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac (patch) | |
| tree | 7998650d27ada12ee7d06a21cbb3b5e89f298378 /doc/integration | |
| parent | 060c842402c00f830a810702600cbe39dfa6cf62 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/saml.md | 6 | ||||
| -rw-r--r-- | doc/integration/shibboleth.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md index 47ffe333c0f..5cb57baf353 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -370,14 +370,14 @@ You may also bypass the auto signin feature by browsing to >**Note:** This setting is only available on GitLab 8.6 and above. This setting should only be used to map attributes that are part of the -OmniAuth info hash schema. +OmniAuth `info` hash schema. `attribute_statements` is used to map Attribute Names in a SAMLResponse to entries -in the OmniAuth [info hash](https://github.com/omniauth/omniauth/wiki/Auth-Hash-Schema#schema-10-and-later). +in the OmniAuth [`info` hash](https://github.com/omniauth/omniauth/wiki/Auth-Hash-Schema#schema-10-and-later). For example, if your SAMLResponse contains an Attribute called 'EmailAddress', specify `{ email: ['EmailAddress'] }` to map the Attribute to the -corresponding key in the info hash. URI-named Attributes are also supported, e.g. +corresponding key in the `info` hash. URI-named Attributes are also supported, e.g. `{ email: ['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'] }`. This setting allows you tell GitLab where to look for certain attributes required diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md index 8c456e7d3d1..a4a71c655a2 100644 --- a/doc/integration/shibboleth.md +++ b/doc/integration/shibboleth.md @@ -8,7 +8,7 @@ In order to enable Shibboleth support in GitLab we need to use Apache instead of To enable the Shibboleth OmniAuth provider you must configure Apache Shibboleth module. The installation and configuration of the module itself is out of the scope of this document. -Check <https://wiki.shibboleth.net/confluence/display/SP3/Apache> for more info. +Check <https://wiki.shibboleth.net/confluence/display/SP3/Apache> for more information. You can find Apache config in [GitLab Recipes](https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache). |