summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-02 09:16:49 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-02 09:16:49 +0000
commit7a94a46c3006385d2b9215dd2fb0197a8c21a304 (patch)
tree09f361956df60296f53e18e0a117cbd94de5ae39
parent59950380b69f5d1fdc3efae3c8e4062c0782cf25 (diff)
parent9e841cf1a894c5bb88a470ffae0f59f12e6be8c2 (diff)
downloadgitlab-ce-7a94a46c3006385d2b9215dd2fb0197a8c21a304.tar.gz
Merge branch 'saml-troubleshooting' into 'master'
Add Troubleshooting section to SAML doc. In response to #1898. We'll properly fix it in another MR. See merge request !917
-rw-r--r--doc/integration/saml.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index a8cc5c8f74a..4aa6dbe758a 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -75,3 +75,8 @@ At a minimum the IdP *must* provide a claim containing the user's email address,
On the sign in page there should now be a SAML button below the regular sign in form. Click the icon to begin the authentication process. If everything goes well the user will be returned to GitLab and will be signed in.
+## Troubleshooting
+
+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.