root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
gitlab-ce/spec/requests/api
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
..
api_helpers_spec.rb Fix API::APIHelpers -> API::Helpers; 2015-10-23 11:42:57 +08:00
branches_spec.rb Fix spec 2015-12-18 12:43:53 -02:00
commit_status_spec.rb Add allow_failure field to commit status API 2015-11-03 20:41:19 -08:00
commits_spec.rb Implement Commit Status API 2015-10-12 11:53:49 +02:00
doorkeeper_access_spec.rb Fix part of api specs for rubocop 2015-06-22 15:05:19 +02:00
files_spec.rb Add ability to fetch the commit ID of the last commit that actually touched a file 2015-11-02 17:07:06 +02:00
fork_spec.rb Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
group_members_spec.rb Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
groups_spec.rb Add API group projects specs 2015-12-08 13:34:09 +01:00
internal_spec.rb Allow to configure gitlab_shell_secret location 2015-05-16 21:46:06 +02:00
issues_spec.rb Change `foo.should` syntax to `expect(foo).to` in specs 2015-06-13 18:37:30 -04:00
keys_spec.rb Add API method for get user by ID of an SSH key 2015-09-03 15:47:22 +03:00
labels_spec.rb Add custom ColorValidator 2015-12-07 16:57:26 -05:00
merge_requests_spec.rb Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
milestones_spec.rb Change `foo.should` syntax to `expect(foo).to` in specs 2015-06-13 18:37:30 -04:00
namespaces_spec.rb Make namespace API available to all users 2015-05-28 11:39:12 -07:00
notes_spec.rb Fix specs and rubocop warnings 2016-01-14 10:04:48 +01:00
project_hooks_spec.rb Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
project_members_spec.rb Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00
projects_spec.rb Add API project upload endpoint 2016-01-07 13:37:14 +01:00
repositories_spec.rb Move git tags API to separate file 2015-11-12 15:41:13 +01:00
services_spec.rb Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
session_spec.rb Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
settings_spec.rb Add tests and improve logic 2015-07-06 16:47:19 +02:00
system_hooks_spec.rb Fix part of api specs for rubocop 2015-06-22 15:05:19 +02:00
tags_spec.rb Delete tag via API 2016-01-08 10:10:04 +01:00
triggers_spec.rb Fix triggers tests 2015-12-11 18:02:09 +01:00
users_spec.rb Prevent ldap_blocked users from being blocked/unblocked by the API 2016-01-08 16:26:04 -02:00