diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-09 10:48:31 +0000 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-06-14 22:19:41 +0200 |
| commit | 520a57a10537ba174f69faf763478a8e5a4603a6 (patch) | |
| tree | 526aa6b2bb76ce55dd968eb1edb8200843e82b40 /CHANGELOG | |
| parent | 6e23d642ddb00f7eb05aa74ba666802b398ee39b (diff) | |
| download | gitlab-ce-520a57a10537ba174f69faf763478a8e5a4603a6.tar.gz | |
Merge branch 'saml-ldap-link-flow' into 'master'
Adjust the SAML control flow to allow LDAP identities to be added to an existing SAML user.
It correctly lets an existing SAML user to add their LDAP identity automatically at login.
A customer had issues with the `auto_link_ldap_user` feature. The flow was not working if there was an account with a SAML identity, but no LDAP identity. GitLab would pick up the correct LDAP person, but due to the order of the flow, that LDAP person was never associated with the user.
Fixes #17346
/cc @dblessing @balameb @stanhu
See merge request !4498
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index feee06a3968..4c751d137e8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.8.5 - Fix todos page throwing errors when you have a project pending deletion - Disable Webhooks before proceeding with the GitHub import - Fix importer for GitHub comments on diff + - Adjust the SAML control flow to allow LDAP identities to be added to an existing SAML user v 8.8.4 - Fix LDAP-based login for users with 2FA enabled. !4493 |