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	Fix tests	2016-06-06 17:40:26 +02:00
backend	Remove instances of Auth.new	2016-06-03 17:08:44 +02:00
badge	Extend build status badge, add html/markdown methods	2016-04-06 19:56:34 +02:00
bitbucket_import	Enable Performance/RangeInclude cop and fix single offense	2016-05-23 13:10:42 -04:00
ci	Improve Ci config loader by changing method signature	2016-06-07 12:53:46 +02:00
database	change add_concurrent_index function arguments	2016-06-06 13:06:21 -03:00
diff	Add leading comment space cop	2016-05-31 19:33:46 -03:00
email	Syntax-highlight diffs in push emails	2016-05-17 13:23:17 +01:00
fogbugz_import	create import data in service	2016-05-10 11:10:51 +02:00
gfm	Remove reduntant move_to_store override	2016-03-30 12:50:19 +02:00
git
github_import	Check if GitHub rate limite API was reached before update Webhooks	2016-06-07 10:57:58 -03:00
gitlab_import	Add leading comment space cop	2016-05-31 19:33:46 -03:00
gitorious_import
google_code_import	create import data in service	2016-05-10 11:10:51 +02:00
graphs
ldap	Enable Style/EmptyLinesAroundAccessModifier rubocop cop	2016-06-03 10:34:20 +02:00
lfs
markdown
metrics	Add cache count metrics to rails cache	2016-05-15 19:47:41 +01:00
middleware	Enable Style/Semicolon rubocop style cop	2016-06-01 08:45:14 +02:00
o_auth	Syntax fixes and better logging around the ldap_person method.	2016-06-08 18:09:43 -05:00
saml	Moved find_or_create_ldap_user method to parent class and added logging.	2016-06-07 11:21:20 -05:00
sanitizers	Fix warning messages with SVG ALLOWED_ELEMENTS	2016-05-19 01:35:04 -05:00
sherlock
sidekiq_middleware	Use SIGTERM during Sidekiq memory shutdown	2016-04-21 14:49:15 +02:00
sql
access.rb
akismet_helper.rb	Use ActionDispatch Remote IP for Akismet checking	2016-04-27 22:12:55 -07:00
app_logger.rb
asciidoc.rb	Fix relative links in other markup formats	2016-02-12 17:20:59 +01:00
auth.rb	Fix tests	2016-06-06 17:40:26 +02:00
award_emoji.rb	Incorportate feedback	2016-06-01 12:10:08 +02:00
bitbucket_import.rb
blame.rb	Load all blob data when highlighting content for git-blame.	2016-02-11 18:30:05 -05:00
build_data_builder.rb	Try to use pipeline where applicable	2016-06-03 13:09:49 +02:00
closing_issue_extractor.rb
color_schemes.rb
config_helper.rb
contributions_calendar.rb	Group the contributing calendar by day	2016-05-16 12:22:17 +01:00
contributor.rb
current_settings.rb	Allow custom text on 'almost there' page	2016-06-08 19:08:53 +01:00
database.rb	Improve Issuable.order_labels_priority	2016-06-06 11:59:49 -05:00
devise_failure.rb	Use a custom Devise failure app to handle unauthenticated .zip requests	2016-03-08 23:49:30 -05:00
exclusive_lease.rb	clean up ExclusiveLease	2016-04-13 13:12:05 +03:00
force_push_check.rb
git.rb	Freeze the expression instead of the literal	2016-02-05 08:39:44 +01:00
git_access.rb	Improve multiple branch push performance by memoizing permission checking	2016-05-09 01:17:14 -07:00
git_access_status.rb
git_access_wiki.rb
git_logger.rb
git_post_receive.rb	Back-porting PostReceive refactor made for EE 🍺	2016-03-17 00:24:12 -03:00
git_ref_validator.rb
gitignore.rb	Update API and fetching task	2016-05-20 15:58:36 -05:00
gitorious_import.rb
gon_helper.rb	Merge remote-tracking branch 'origin/master' into issue_14904	2016-04-21 12:47:32 -05:00
highlight.rb	Properly handle bigger files	2016-04-28 21:28:39 +02:00
identifier.rb
import_formatter.rb
import_sources.rb
incoming_email.rb	Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature	2016-03-25 13:05:15 +01:00
issues_labels.rb
key_fingerprint.rb	Enable Lint/AmbiguousOperator rubocop cop	2016-06-03 10:59:43 +02:00
lazy.rb	Added Gitlab::Lazy	2016-05-26 13:58:01 +02:00
logger.rb
markup_helper.rb	Enable Rubocop Casecmp Performance Cop.	2016-05-10 18:23:25 -06:00
metrics.rb	Fix setting of "action" for Grape transactions	2016-04-20 22:42:52 +02:00
note_data_builder.rb	Refactor and expose only Gitlab::UrlBuilder.build(record)	2016-04-13 16:07:04 +02:00
other_markup.rb	Fix relative links in other markup formats	2016-02-12 17:20:59 +01:00
popen.rb
production_logger.rb
project_search_results.rb	Confidential notes data leak	2016-05-31 21:32:53 +03:00
push_data_builder.rb	API support for the 'since' and 'until' operators on commit requests	2016-04-29 09:26:52 +02:00
recaptcha.rb
redis.rb	Codestyle: make sure we have space around operators	2016-05-13 04:46:56 -03:00
reference_extractor.rb	Split Markdown rendering & reference gathering	2016-05-26 17:14:00 +02:00
regex.rb	WIP	2016-05-08 22:50:30 +02:00
repository_check_logger.rb	Rename almost all the things	2016-04-06 13:47:05 +02:00
routing.rb	Added & use Gitlab::Routing for URL helpers	2016-04-01 11:13:48 +02:00
search_results.rb	Restrict access to confidential issues on search results	2016-03-17 20:55:59 -03:00
seeder.rb	Replace colorize gem with rainbow.	2016-06-03 10:37:09 -06:00
sherlock.rb
sidekiq_logger.rb
snippet_search_results.rb	Refactor Gitlab::SnippetSearchResults	2016-03-11 15:25:22 -05:00
themes.rb
upgrader.rb
uploads_transfer.rb
url_builder.rb	Use the relative url prefix for links in Wiki	2016-05-13 22:42:07 +02:00
url_sanitizer.rb	fix changelog and merge	2016-05-23 09:11:21 +02:00
user_access.rb	Move method to User	2016-03-10 12:37:14 +01:00
utils.rb
version_info.rb
visibility_level.rb	Fix forks creation when visibility level is restricted	2016-05-25 10:57:00 -04:00
workhorse.rb	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller	2016-06-08 10:31:33 +02:00