gitlab-org--gitlab-foss/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
..
api Allow custom text on 'almost there' page 2016-06-08 19:08:53 +01:00
assets
backup Replace colorize gem with rainbow. 2016-06-03 10:37:09 -06:00
banzai Merge branch '18019-fix-wiki-linking' into 'master' 2016-06-09 08:37:27 +00:00
ci Merge branch 'refactor/ci-config-add-facade' into 'master' 2016-06-07 16:05:26 +00:00
container_registry Provide full test coverage to lib/container_registry API implementation 2016-05-17 13:20:11 -05:00
gitlab Merge branch 'saml-ldap-link-flow' into 'master' 2016-06-09 10:48:31 +00:00
json_web_token Rename JWT to JSONWebToken 2016-05-14 18:23:31 -05:00
omni_auth
rouge/formatters
support Add note about port needed in NGINX config 2016-05-22 19:20:28 -05:00
tasks Fix missed colorize methods. 2016-06-06 15:32:36 -06:00
banzai.rb
disable_email_interceptor.rb
event_filter.rb Add leading comment space cop 2016-05-31 19:33:46 -03:00
extracts_path.rb
file_size_validator.rb Get rid of more requires, which causes warnings when code is reloaded 2016-04-19 11:48:10 +02:00
file_streamer.rb
gitlab.rb Fix a few places where autoloading would fail 2016-05-10 11:51:19 +02:00
gt_one_coercion.rb
repository_cache.rb
static_model.rb
unfold_form.rb
uploaded_file.rb
version_check.rb