summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-01-10 18:20:03 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-01-10 18:20:03 +0000
commit968430fe8c4eaa1de5799d9e629375c3bbe38853 (patch)
tree248732c92f67483a422e6ad967486837678160bd
parentacd171d163e5709e264e1ea8db769bc7c7e867c1 (diff)
parent7e4d640d3ee18e9f7050f77a26fbfa54b5c680bc (diff)
downloadgitlab-ce-968430fe8c4eaa1de5799d9e629375c3bbe38853.tar.gz
Merge branch '29322-include-the-crowd-application-permission-information-on-the-crowd-omniauth-provider-page' into 'master'
Resolve "Include the Crowd application permission information on the "Crowd OmniAuth Provider" page" Closes #29322 See merge request gitlab-org/gitlab-ce!16317
-rw-r--r--doc/administration/auth/crowd.md12
-rw-r--r--doc/administration/auth/img/crowd_application_authorisation.pngbin0 -> 126994 bytes
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/administration/auth/crowd.md b/doc/administration/auth/crowd.md
index 2c289c67a6d..6db74958d5a 100644
--- a/doc/administration/auth/crowd.md
+++ b/doc/administration/auth/crowd.md
@@ -66,3 +66,15 @@ On the sign in page there should now be a Crowd tab in the sign in form.
[reconfigure]: ../restart_gitlab.md#omnibus-gitlab-reconfigure
[restart]: ../restart_gitlab.md#installations-from-source
+
+## Troubleshooting
+
+If you see an error message like the one below when you sign in after Crowd authentication is configured, you may want to consult the Crowd administrator for the Crowd log file to know the exact cause:
+
+```
+could not authorize you from Crowd because invalid credentials
+```
+
+Please make sure the Crowd users who need to login to GitLab are authorized to [the application](#configure-a-new-crowd-application) in the step of **Authorisation**. This could be verified by try "Authentication test" for Crowd as of 2.11.
+
+![Example Crowd application authorisation configuration](img/crowd_application_authorisation.png) \ No newline at end of file
diff --git a/doc/administration/auth/img/crowd_application_authorisation.png b/doc/administration/auth/img/crowd_application_authorisation.png
new file mode 100644
index 00000000000..70339891b34
--- /dev/null
+++ b/doc/administration/auth/img/crowd_application_authorisation.png
Binary files differ