gitlab-org--gitlab-foss/spec/lib
Douwe Maan 30ee4ea665 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
2016-06-09 10:48:31 +00:00
..
banzai Merge branch '18019-fix-wiki-linking' into 'master' 2016-06-09 08:37:27 +00:00
ci Rename all [ci_]commit to [ci_]pipeline in specs and features 2016-06-03 16:22:26 +02:00
container_registry Enable RSpec/NotToNot cop and auto-correct offenses 2016-05-24 15:40:29 -04:00
gitlab Merge branch 'saml-ldap-link-flow' into 'master' 2016-06-09 10:48:31 +00:00
json_web_token Enable RSpec/NotToNot cop and auto-correct offenses 2016-05-24 15:40:29 -04:00
disable_email_interceptor_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
extracts_path_spec.rb Added & use Gitlab::Routing for URL helpers 2016-04-01 11:13:48 +02:00
file_size_validator_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
git_ref_validator_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
gitlab_spec.rb Add Gitlab.com? method 2016-04-12 17:30:11 -04:00
repository_cache_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00