delta/gitlab/gitlab-ce.git/spec/services, branch doc_refactor_namespaces_api gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14T11:00:08+00:00 Douwe Maan douwe@gitlab.com 2016-01-14T11:00:08+00:00 4d64a32c88dd5f87621d391c0f10f6acef094073 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 

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
 Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadle/gitlabhq 2016-01-13T09:12:30+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-01-13T09:12:30+00:00 32a5b741c2cc46c97e905154920e74fbb2c2ac90 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge pull request #9952 from tbeadle/user_id_in_member_system_hook 2016-01-13T09:09:37+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-01-13T09:09:37+00:00 678ee247eebcaa5759ddb607d80fee64cf643753 Include the user_id in user_*_team system hooks. 
Include the user_id in user_*_team system hooks.
 Merge branch 'api-project-upload' into 'master' 2016-01-08T20:29:43+00:00 Robert Speicher robert@gitlab.com 2016-01-08T20:29:43+00:00 af68897acda31a55093e2b5fdd7eba61e54b404c Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329 

Add API project upload endpoint

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317

See merge request !2329
 Code style fixes and some code simplified 2016-01-08T18:26:04+00:00 Gabriel Mazetto gabriel@gitlab.com 2016-01-07T16:01:01+00:00 47e4613f4adc2d6ef4b066a87ec772ef8044bdd5 






Repair ldap_blocked state when no ldap identity exist anymore
2016-01-08T18:26:04+00:00

Gabriel Mazetto
gabriel@gitlab.com

2016-01-06T07:38:52+00:00

ec67e9be1d7486199b47e19c766202a8bfdefe93












DRY up upload and download services
2016-01-08T16:38:53+00:00

Douwe Maan
douwe@gitlab.com

2016-01-08T16:38:53+00:00

0614793b38db4711053cbcb4fa80d9c8cc492eec












Include user_username in user_(add_to/remove_from)_(project/group) system hooks.
2016-01-07T17:54:54+00:00

Tommy Beadle
tbeadle@arbor.net

2016-01-07T17:54:54+00:00

1f64332e11949a5954b1e4ac7c6667b03ea70a0b












Include the username in user_create/destroy system hooks.
2016-01-07T17:54:35+00:00

Tommy Beadle
tbeadle@arbor.net

2016-01-07T17:54:35+00:00

dada25d4472ec9ad601447fdd12da2301ac9ee79












Include the user_id in user_*_team system hooks.
2016-01-06T16:49:59+00:00

Tommy Beadle
tbeadle@arbor.net

2016-01-06T16:42:31+00:00

4d41294d71f2a8910a3aa5d475f8eb3923ca3531

This fixes an issue where the user_id is not included in the data for
user_add_to_team and user_remove_from_team system hooks.  The documentation
already states that the user_id should be included.





This fixes an issue where the user_id is not included in the data for
user_add_to_team and user_remove_from_team system hooks.  The documentation
already states that the user_id should be included.