gitlab-org--gitlab-foss/lib/api
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
..
api.rb
api_guard.rb
branches.rb
commit_statuses.rb
commits.rb
deploy_keys.rb
entities.rb Modify CI features in projects API 2016-01-11 15:27:20 +01:00
files.rb Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
group_members.rb
groups.rb
helpers.rb Modify CI features in projects API 2016-01-11 15:27:20 +01:00
internal.rb
issues.rb
keys.rb
labels.rb
merge_requests.rb Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running 2016-01-05 16:30:03 +01:00
milestones.rb
namespaces.rb
notes.rb Ensure the API doesn't return notes that the current user shouldn't see 2016-01-13 19:42:36 +01:00
project_hooks.rb
project_members.rb
project_snippets.rb
projects.rb Merge branch 'ci/api-projects' into 'master' 2016-01-13 13:32:35 +00:00
repositories.rb
services.rb
session.rb
settings.rb
system_hooks.rb
tags.rb Delete tag via API 2016-01-08 10:10:04 +01:00
triggers.rb
users.rb Codestyle changes 2016-01-12 12:29:10 -02:00