gitlab-org--gitlab-foss/app
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:
![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png)

There will be another MR for the EE version.

See merge request !2242
2016-01-14 11:00:08 +00:00
..
assets Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
controllers Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
finders Drop projects order in IssuableFinder 2016-01-07 14:53:02 +01:00
helpers Move BroadcastMessage#status to a helper since it's presentational 2016-01-13 11:49:59 -05:00
mailers Merge branch 'rs-abuse-reports-refactor' into 'master' 2016-01-05 14:11:15 +00:00
models Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
services Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
uploaders DRY up upload and download services 2016-01-08 17:38:53 +01:00
validators Blacklist 'new' 2016-01-08 10:19:22 +01:00
views Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
workers Write to InfluxDB directly via UDP 2015-12-29 14:53:45 +01:00