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	Merge branch 'feature/ldap-sync-edgecases' into 'master'	2016-01-14 11:00:08 +00:00
assets	…
backup	Backup LFS objects same as any upload.	2015-11-19 10:43:45 +01:00
banzai	Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL;	2016-01-12 18:19:55 +08:00
ci	Use method that creates runners registration token	2015-12-23 11:45:17 +01:00
gitlab	Merge branch 'feature/ldap-sync-edgecases' into 'master'	2016-01-14 11:00:08 +00:00
omni_auth	Fix signin with OmniAuth providers	2015-12-08 14:58:15 +01:00
rouge/formatters	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
support	Fix spelling of "it's" to "its" where appropriate.	2015-12-24 15:28:12 +11:00
tasks	Disable colorization if STDOUT is not a tty	2016-01-12 21:34:23 -05:00
award_emoji.rb	Emoji picker: better alias handling	2015-12-24 11:28:55 +02:00
banzai.rb	Move Markdown/reference logic from Gitlab::Markdown to Banzai	2015-12-15 15:51:16 +01:00
disable_email_interceptor.rb	…
event_filter.rb	Fix rubocop warnings in lib	2015-10-03 01:29:58 -05:00
extracts_path.rb	Only render 404 page from /public	2015-10-13 20:12:34 +03:00
file_size_validator.rb	…
file_streamer.rb	Implement Build Artifacts	2015-11-10 12:51:50 +01:00
gitlab.rb	Revert "Merge branch 'revert-satellites' into 'master' "	2015-08-11 14:33:31 +02:00
gt_one_coercion.rb	…
repository_cache.rb	Store commit count in project table	2015-07-17 15:22:56 +02:00
static_model.rb	…
unfold_form.rb	Gitlab Issue 707: Indent unfolded code 1 character	2015-07-22 09:58:17 -04:00
uploaded_file.rb	Implement Build Artifacts	2015-11-10 12:51:50 +01:00
version_check.rb	Update version check images to use SVG	2016-01-05 14:35:29 -05:00