kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec/lib/gitlab
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
..
backend Fix after column rename 2015-12-11 18:02:10 +01:00
bitbucket_import Tag lib specs 2015-12-09 11:55:42 +01:00
diff Tag lib specs 2015-12-09 11:55:42 +01:00
email Update spec 2016-01-07 15:51:12 +01:00
github_import Ensure that we're only importing local pull requests 2016-01-05 15:24:55 -02:00
gitlab_import Tag lib specs 2015-12-09 11:55:42 +01:00
gitorious_import Tag lib specs 2015-12-09 11:55:42 +01:00
google_code_import Tag lib specs 2015-12-09 11:55:42 +01:00
ldap fixed LDAP activation on login to use new ldap_blocked state 2016-01-14 03:31:27 -02:00
lfs Tag lib specs 2015-12-09 11:55:42 +01:00
metrics Randomize metrics sample intervals 2016-01-13 12:57:46 +01:00
o_auth AuthHash should not parameterize email user 2015-12-10 18:49:48 -05:00
sherlock Tag lib specs 2015-12-09 11:55:42 +01:00
sql Tag lib specs 2015-12-09 11:55:42 +01:00
asciidoc_spec.rb Move Markdown/reference logic from Gitlab::Markdown to Banzai 2015-12-15 15:51:16 +01:00
auth_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
build_data_builder_spec.rb Suppress e-mails on failed builds if allow_failure is set 2016-01-07 10:45:39 -08:00
closing_issue_extractor_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
color_schemes_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
database_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
git_access_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
git_access_wiki_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
incoming_email_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
inline_diff_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
key_fingerprint_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
markup_helper_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
metrics_spec.rb Stop tracking call stacks for instrumented views 2016-01-12 15:41:22 +01:00
note_data_builder_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
popen_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
project_search_results_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
push_data_builder_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
reference_extractor_spec.rb Backport JIRA service 2015-12-18 14:19:48 -06:00
regex_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
themes_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
upgrader_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
uploads_transfer_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
url_builder_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
version_info_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00