• Douwe Maan's avatar
    Merge branch 'saml-ldap-link-flow' into 'master' · 30ee4ea6
    Douwe Maan authored
    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
    30ee4ea6
Name
Last commit
Last update
app Loading commit data...
bin Loading commit data...
builds Loading commit data...
config Loading commit data...
db Loading commit data...
doc Loading commit data...
docker Loading commit data...
features Loading commit data...
fixtures/emojis Loading commit data...
generator_templates/active_record/migration Loading commit data...
lib Loading commit data...
log Loading commit data...
public Loading commit data...
scripts Loading commit data...
shared Loading commit data...
spec Loading commit data...
tmp Loading commit data...
vendor Loading commit data...
.csscomb.json Loading commit data...
.flayignore Loading commit data...
.foreman Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.gitlab-ci.yml Loading commit data...
.hound.yml Loading commit data...
.pkgr.yml Loading commit data...
.rspec Loading commit data...
.rubocop.yml Loading commit data...
.ruby-version Loading commit data...
.scss-lint.yml Loading commit data...
.simplecov Loading commit data...
.teatro.yml Loading commit data...
.vagrant_enabled Loading commit data...
CHANGELOG Loading commit data...
CONTRIBUTING.md Loading commit data...
GITLAB_SHELL_VERSION Loading commit data...
GITLAB_WORKHORSE_VERSION Loading commit data...
Gemfile Loading commit data...
Gemfile.lock Loading commit data...
LICENSE Loading commit data...
MAINTENANCE.md Loading commit data...
PROCESS.md Loading commit data...
Procfile Loading commit data...
README.md Loading commit data...
Rakefile Loading commit data...
VERSION Loading commit data...
config.ru Loading commit data...
doc_styleguide.md Loading commit data...
docker-compose.yml Loading commit data...