diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 11:55:32 +0100 |
---|---|---|
committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 11:55:32 +0100 |
commit | 3f9cdb9c9822f176ebe4ce8aa34a84e06bae60f0 (patch) | |
tree | 8b029adbe769e0c082f2e83ba831ba065648dbb4 /doc/integration/shibboleth.md | |
parent | 7e36fa398b6f2e0304d852b7c77ef30d83e62ed4 (diff) | |
parent | 7eb2f184e6a74c84a58ba07d78d2bcaab764a42d (diff) | |
download | gitlab-ce-3f9cdb9c9822f176ebe4ce8aa34a84e06bae60f0.tar.gz |
Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels
Diffstat (limited to 'doc/integration/shibboleth.md')
-rw-r--r-- | doc/integration/shibboleth.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md index 8611d4f7315..0e43b4a39a4 100644 --- a/doc/integration/shibboleth.md +++ b/doc/integration/shibboleth.md @@ -107,7 +107,7 @@ you will not get a shibboleth session! RewriteEngine on #Don't escape encoded characters in api requests - RewriteCond %{REQUEST_URI} ^/api/v3/.* + RewriteCond %{REQUEST_URI} ^/api/v4/.* RewriteCond %{REQUEST_URI} !/Shibboleth.sso RewriteCond %{REQUEST_URI} !/shibboleth-sp RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE] |