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:  There will be another MR for the EE version. See merge request !2242		2016-01-14 11:00:08 +00:00
..
api.rb	Reimplement Trigger API	2015-12-11 18:02:09 +01:00
api_guard.rb	Rubocop: Style/CaseIndentation enabled	2015-02-02 21:26:40 -08:00
branches.rb	Added the missing comma	2015-03-31 17:08:33 +01:00
commit_statuses.rb	Migrate CI::Project to Project	2015-12-11 18:02:09 +01:00
commits.rb	Order commit comments in API chronologically	2015-05-08 14:34:10 +02:00
deploy_keys.rb
entities.rb	Modify CI features in projects API	2016-01-11 15:27:20 +01:00
files.rb	Automatically fork a project when not allowed to edit a file.	2015-12-18 10:03:34 +01:00
group_members.rb	Track who created a group or project member.	2015-04-14 12:06:42 +02:00
groups.rb	Add API group projects endpoint.	2015-12-07 17:10:40 +01:00
helpers.rb	Modify CI features in projects API	2016-01-11 15:27:20 +01:00
internal.rb	Improve Git access error messages.	2015-05-13 09:41:55 +02:00
issues.rb	Merge branch 'rename-abilities' into 'master'	2015-06-26 16:39:17 +00:00
keys.rb	Add API method for get user by ID of an SSH key	2015-09-03 15:47:22 +03:00
labels.rb
merge_requests.rb	Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running	2016-01-05 16:30:03 +01:00
milestones.rb	Fix the test and add documentation for the "per-milestone issues API call"	2015-01-22 12:14:53 +01:00
namespaces.rb	Make namespace API available to all users	2015-05-28 11:39:12 -07:00
notes.rb	Ensure the API doesn't return notes that the current user shouldn't see	2016-01-13 19:42:36 +01:00
project_hooks.rb	Migrate CI::Services and CI::WebHooks to Services and WebHooks	2015-12-10 16:04:08 +01:00
project_members.rb	Use project_member instead of team_member.	2015-03-15 13:50:38 +01:00
project_snippets.rb	Rename abilities to correspond contoller/model action names	2015-06-26 15:55:56 +02:00
projects.rb	Merge branch 'ci/api-projects' into 'master'	2016-01-13 13:32:35 +00:00
repositories.rb	Move git tags API to separate file	2015-11-12 15:41:13 +01:00
services.rb	Hide passwords to non-admin users in the services API	2015-10-12 15:24:00 +02:00
session.rb
settings.rb	Add tests and improve logic	2015-07-06 16:47:19 +02:00
system_hooks.rb	Added X-GitLab-Event header for web hooks	2015-05-08 16:49:03 +03:00
tags.rb	Delete tag via API	2016-01-08 10:10:04 +01:00
triggers.rb	Fix triggers tests	2015-12-11 18:02:09 +01:00
users.rb	Codestyle changes	2016-01-12 12:29:10 -02:00