diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-12-12 12:15:30 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-12-12 12:15:30 +0000 |
| commit | 2947eda52d82ba1f5be14f94df67d0dfffbc68c1 (patch) | |
| tree | 1a315c8928ec011e27a70c7e76950aa483ca19ff | |
| parent | e8d35ea149f1d40768d99835c30d40e4028953f0 (diff) | |
| parent | e6e27f03d77fa57b82f9189f45be7eec1ffe37ac (diff) | |
| download | gitlab-ce-2947eda52d82ba1f5be14f94df67d0dfffbc68c1.tar.gz | |
Merge branch 'custom-saml-button-label' into 'master'
add details on how to change saml button label
Instructions on how to customize SAML login button text.
See merge request !2079
| -rw-r--r-- | doc/integration/saml.md | 5 |
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 |