delta/gitlab/gitlab-ce.git/app/services, branch doc_refactor_groups_api

Merge branch 'backport-ee' into 'master'

2016-01-14T18:39:49+00:00


Backport two commits from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110

See merge request !2424

Merge branch 'feature/ldap-sync-edgecases' into 'master'

2016-01-14T11:00:08+00:00


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

Param should be present, not just truthy

2016-01-14T10:30:28+00:00

Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadle/gitlabhq

2016-01-13T09:12:30+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge pull request #9952 from tbeadle/user_id_in_member_system_hook

2016-01-13T09:09:37+00:00

Include the user_id in user_*_team system hooks.

Generate builds when creating tag using web interface

2016-01-11T11:37:27+00:00

Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce

2016-01-11T09:17:27+00:00

Merge gitlab.com:gitlab-org/gitlab-ce

2016-01-11T08:32:35+00:00

Merge branch 'api-project-upload' into 'master'

2016-01-08T20:29:43+00:00


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