gitlab-org--gitlab-foss/app/views/admin/users
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
..
_form.html.haml Update the note for admin user. 2014-07-17 14:03:17 +02:00
_head.html.haml Improve admin area button style 2016-01-11 09:11:40 -06:00
_profile.html.haml Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
_projects.html.haml Fix Error 500 when viewing user's personal projects from admin page 2015-11-25 14:00:35 -08:00
edit.html.haml Use consistent casing for page titles 2015-12-02 14:41:54 +01:00
groups.html.haml Refactor admin user page 2015-06-22 17:12:20 +02:00
index.html.haml Fix Admin/Users view to position buttons without spacing magic 2016-01-14 03:08:40 -02:00
keys.html.haml Refactor admin user page 2015-06-22 17:12:20 +02:00
new.html.haml Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
projects.html.haml Fix Error 500 when viewing user's personal projects from admin page 2015-11-25 14:00:35 -08:00
show.html.haml Add user's last used IP addresses to admin page 2016-01-12 00:59:29 -08:00