Douwe Maan 4d64a32c88 Merge branch 'feature/ldap-sync-edgecases' into 'master' ... LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users:  There will be another MR for the EE version. See merge request !2242		2016-01-14 11:00:08 +00:00
..
access.rb	Merge branch 'feature/ldap-sync-edgecases' into 'master'	2016-01-14 11:00:08 +00:00
adapter.rb	Optimize LDAP and add a search timeout	2016-01-11 08:17:32 -06:00
auth_hash.rb	Fix LDAP attribute mapping	2015-09-23 16:37:59 +02:00
authentication.rb	Update authentication.rb	2015-05-04 14:09:03 +02:00
config.rb	Optimize LDAP and add a search timeout	2016-01-11 08:17:32 -06:00
person.rb	Faulty LDAP DN name escaping removed	2015-03-21 22:57:55 +01:00
user.rb	No mb_chars needed anymore	2015-12-24 12:37:46 +01:00