diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-09 10:48:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-09 10:48:31 +0000 |
| commit | 30ee4ea6659c91ac6a249d700a9fcdd266676942 (patch) | |
| tree | d8f75d19b9bff13fd93d8fe38ce4373404d7b331 /lib/api/files.rb | |
| parent | 1e4db9ed0f538d17e876ec36b538f05a31989cc0 (diff) | |
| parent | 9282810fb7b6102657a0ddb2a02f71b6da22067f (diff) | |
| download | gitlab-ce-30ee4ea6659c91ac6a249d700a9fcdd266676942.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.
## What does this MR do?
It correctly lets an existing SAML user to add their LDAP identity automatically at login.
## Why was this MR needed?
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.
## What are the relevant issue numbers?
Fixes #17346
/cc @dblessing @balameb @stanhu
See merge request !4498
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions