gitlab-org--gitlab-foss/spec
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
..
benchmarks
controllers Repair ldap_blocked state when no ldap identity exist anymore 2016-01-08 16:26:04 -02:00
factories Update BroadcastMessage model 2016-01-13 11:34:58 -05:00
features Merge branch 'fix/ci-linter-sequence-validations' into 'master' 2016-01-11 19:09:09 +00:00
finders remove public field from namespace and refactoring 2016-01-04 16:00:29 +02:00
fixtures Milestone reference is a Markdown link 2016-01-07 12:26:05 +01:00
helpers Move `BroadcastMessage#status` to a helper since it's presentational 2016-01-13 11:49:59 -05:00
javascripts reverting more MR ajax files, will appear in different commit 2016-01-12 14:55:54 -05:00
lib Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
mailers Make AbuseReportMailer responsible for knowing if it should deliver 2016-01-04 18:59:25 -05:00
models Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
requests Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
routing Merge branch 'issue_3076' into 'master' 2016-01-08 15:52:05 +00:00
services Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14 11:00:08 +00:00
support Render milestone links as references 2015-12-24 14:43:07 +01:00
tasks/gitlab
views/help
workers Write to InfluxDB directly via UDP 2015-12-29 14:53:45 +01:00
factories.rb
factories_spec.rb
rails_helper.rb
spec_helper.rb
teaspoon_env.rb