summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2015-12-11 23:16:37 +0000
committerBen Bodenmiller <bbodenmiller@hotmail.com>2015-12-11 23:16:37 +0000
commite6e27f03d77fa57b82f9189f45be7eec1ffe37ac (patch)
treebf2da78b9eb11f650ab3783d207938247ba1a4ca /doc
parent7dfbf7cf55e5e96986eca8711bfdd92956c09498 (diff)
downloadgitlab-ce-e6e27f03d77fa57b82f9189f45be7eec1ffe37ac.tar.gz
add details on how to change saml button label
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/saml.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index 1b8c28dd0f4..1632e42f701 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -38,7 +38,8 @@ First configure SAML 2.0 support in GitLab, then register the GitLab application
idp_sso_target_url: 'https://login.example.com/idp',
issuer: 'https://gitlab.example.com',
name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
- }
+ },
+ "label" => "Company Login" # optional label for SAML login button, defaults to "Saml"
}
]
```
@@ -79,4 +80,4 @@ On the sign in page there should now be a SAML button below the regular sign in
If you see a "500 error" in GitLab when you are redirected back from the SAML sign in page, this likely indicates that GitLab could not get the email address for the SAML user.
-Make sure the IdP provides a claim containing the user's email address, using claim name 'email' or 'mail'. The email will be used to automatically generate the GitLab username.
+Make sure the IdP provides a claim containing the user's email address, using claim name 'email' or 'mail'. The email will be used to automatically generate the GitLab username. \ No newline at end of file