kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/admin
History
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
..
abuse_reports Disable "Already Blocked" button in admin abuse report page 2016-01-09 21:25:18 -08:00
application_settings Make the metrics sampler interval configurable 2016-01-13 12:29:48 +01:00
applications Make tables full width. 2015-10-19 11:19:45 +02:00
background_jobs Make tables full width. 2015-10-19 11:19:45 +02:00
broadcast_messages Remove (invalid) timestamp formatting 2016-01-13 12:01:58 -05:00
builds Show 'All' tab by default in the builds page 2016-01-04 10:21:10 -02:00
dashboard number_with_delimiter most of the things 2015-12-31 20:04:23 -05:00
deploy_keys Make tables full width. 2015-10-19 11:19:45 +02:00
groups Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
hooks
identities Allow admin to create new user identities 2015-12-15 13:54:35 -06:00
keys
labels Improve admin area button style 2016-01-11 09:11:40 -06:00
logs
projects Improve admin area button style 2016-01-11 09:11:40 -06:00
runners Use method that creates runners registration token 2015-12-23 11:45:17 +01:00
services Make tables full width. 2015-10-19 11:19:45 +02:00
users Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00