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
..
auth
backend
badge
bitbucket_import
ci
database
diff
email
fogbugz_import
gfm
git
github_import
gitlab_import
gitorious_import
google_code_import
graphs
ldap
lfs
markdown
metrics
middleware
o_auth
saml
sanitizers
sherlock
sidekiq_middleware
sql
access.rb
akismet_helper.rb
app_logger.rb
asciidoc.rb
auth.rb
award_emoji.rb
bitbucket_import.rb
blame.rb
build_data_builder.rb
closing_issue_extractor.rb
color_schemes.rb
config_helper.rb
contributions_calendar.rb
contributor.rb
current_settings.rb
database.rb
devise_failure.rb
exclusive_lease.rb
force_push_check.rb
git.rb
git_access.rb
git_access_status.rb
git_access_wiki.rb
git_logger.rb
git_post_receive.rb
git_ref_validator.rb
gitignore.rb
gitorious_import.rb
gon_helper.rb
highlight.rb
identifier.rb
import_formatter.rb
import_sources.rb
incoming_email.rb
issues_labels.rb
key_fingerprint.rb
lazy.rb
logger.rb
markup_helper.rb
metrics.rb
note_data_builder.rb
other_markup.rb
popen.rb
production_logger.rb
project_search_results.rb
push_data_builder.rb
recaptcha.rb
redis.rb
reference_extractor.rb
regex.rb
repository_check_logger.rb
routing.rb
search_results.rb
seeder.rb
sherlock.rb
sidekiq_logger.rb
snippet_search_results.rb
themes.rb
upgrader.rb
uploads_transfer.rb
url_builder.rb
url_sanitizer.rb
user_access.rb
utils.rb
version_info.rb
visibility_level.rb
workhorse.rb