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
..
backend	Merge gitlab.com:gitlab-org/gitlab-ce	2016-01-06 14:55:44 +01:00
bitbucket_import	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
diff	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
email	Add API project upload endpoint	2016-01-07 13:37:14 +01:00
fogbugz_import	DRY up upload and download services	2016-01-08 17:38:53 +01:00
git	Fire update hook from GitLab	2015-11-30 18:36:34 +02:00
github_import	Ensure that we're only importing local pull requests	2016-01-05 15:24:55 -02:00
gitlab_import	Use CGI.escape instead of URI.escape, because URI is obsoleted.	2016-01-12 18:20:03 +08:00
gitorious_import	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
google_code_import	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
graphs	Refactor commits graph	2014-09-29 12:05:17 +03:00
ldap	Merge branch 'feature/ldap-sync-edgecases' into 'master'	2016-01-14 11:00:08 +00:00
lfs	Recursivity needed if a fork is a fork of a fork.	2015-12-04 12:32:13 +01:00
markdown	Move Markdown/reference logic from Gitlab::Markdown to Banzai	2015-12-15 15:51:16 +01:00
metrics	Randomize metrics sample intervals	2016-01-13 12:57:46 +01:00
middleware	Revert "Increase timeout for Git-over-HTTP requests."	2015-03-19 18:29:20 -07:00
o_auth	Fix identity and user retrieval when special characters are used	2015-12-22 13:23:35 -05:00
sherlock	Added total query time to Sherlock	2015-11-24 10:57:21 +01:00
sidekiq_middleware	Use SIGKILL by default in Sidekiq::MemoryKiller	2015-05-13 17:09:12 +02:00
sql	Fix UNION syntax for MySQL	2015-11-18 13:31:18 +01:00
access.rb	Improve description of branch protection levels.	2015-05-13 09:41:55 +02:00
app_logger.rb	Dry admin logs.	2014-10-06 00:14:46 +02:00
asciidoc.rb	Move Markdown/reference logic from Gitlab::Markdown to Banzai	2015-12-15 15:51:16 +01:00
auth.rb	Session API: Use case-insensitive authentication like in UI	2014-10-30 18:29:18 +02:00
bitbucket_import.rb	Fix specs.	2015-02-24 15:07:24 +01:00
build_data_builder.rb	Suppress e-mails on failed builds if allow_failure is set	2016-01-07 10:45:39 -08:00
closing_issue_extractor.rb	Allow invalid URLs in closing pattern	2015-12-02 18:48:39 +01:00
color_schemes.rb	Add count to Themes and ColorSchemes	2015-08-26 11:30:38 -07:00
compare_result.rb	Add ignore white space option in merge request diff	2015-11-13 16:53:53 +09:00
config_helper.rb	Make app works with strong params	2014-06-26 23:24:17 +03:00
contributions_calendar.rb	Simplify ContributionsCalendar#starting_year and #starting_month	2016-01-01 22:11:34 -05:00
contributor.rb	Move lib/gitlab/contributors to its correct path	2015-04-09 15:34:55 -04:00
current_settings.rb	Handle missing DBs in connect_to_db?	2016-01-08 14:31:39 +01:00
database.rb	Migrate CI WebHooks and Emails to new tables	2015-12-10 16:04:08 +01:00
force_push_check.rb	Replace all usages of git command with configurable binary path	2015-11-03 17:11:09 -05:00
git.rb	Show git version on admin page	2015-12-15 08:02:19 -08:00
git_access.rb	Add support for git lfs.	2015-11-16 12:39:13 +01:00
git_access_status.rb	Rubocop enabled for: Use spaces inside hash literal braces	2015-02-02 20:36:54 -08:00
git_access_wiki.rb	Rename abilities to correspond contoller/model action names	2015-06-26 15:55:56 +02:00
git_logger.rb	Dry admin logs.	2014-10-06 00:14:46 +02:00
git_ref_validator.rb	Replace all usages of git command with configurable binary path	2015-11-03 17:11:09 -05:00
gitorious_import.rb	Define GITORIOUS_HOST only once	2015-06-10 01:31:27 -04:00
identifier.rb	Use project.commit convenience method.	2015-04-24 12:29:36 +02:00
import_formatter.rb	Fix bug where only the first 15 Bitbucket issues would be imported.	2015-09-01 08:50:20 -07:00
import_sources.rb	FogBugz project import	2015-09-08 20:23:01 -04:00
incoming_email.rb	Make Reply by email easier to configure	2015-10-13 13:10:49 +02:00
inline_diff.rb	Move spec to proper place and fix unused variable	2015-11-13 09:45:21 +01:00
issues_labels.rb	remove feature label	2014-10-31 17:22:16 -07:00
key_fingerprint.rb	Simplify regex.	2015-04-14 15:58:28 +02:00
logger.rb	Dry admin logs.	2014-10-06 00:14:46 +02:00
markup_helper.rb	markup_helper: detect .mkd and .mkdn as markdown	2015-08-12 15:29:15 -04:00
metrics.rb	Make the metrics sampler interval configurable	2016-01-13 12:29:48 +01:00
note_data_builder.rb	No longer needed to pass project argument to commit methods.	2015-04-24 12:29:36 +02:00
popen.rb	Style/RedundantReturn enabled	2015-03-24 18:35:57 -07:00
production_logger.rb	Dry admin logs.	2014-10-06 00:14:46 +02:00
project_search_results.rb	Fix commits search for empty repository	2015-11-03 10:16:09 +01:00
push_data_builder.rb	fixes after review	2015-12-07 15:13:06 +02:00
recaptcha.rb	reCAPTCHA is configurable through Admin Settings, no reload needed.	2015-12-28 18:50:29 -02:00
reference_extractor.rb	Merge branch 'master' into milestone-ref	2016-01-05 16:40:23 +01:00
regex.rb	Add ability to create directories in the editor	2015-10-29 15:49:07 +01:00
search_results.rb	Ability to search milestones	2015-08-24 13:59:01 +03:00
seeder.rb	Migrate mailers to ActiveJob	2015-11-26 17:03:43 +02:00
sherlock.rb	Only load rblineprof when actually needed	2015-11-09 15:54:13 +01:00
sidekiq_logger.rb	Dry admin logs.	2014-10-06 00:14:46 +02:00
snippet_search_results.rb	Updating to persist a params snippets variable	2014-09-05 13:30:55 -04:00
themes.rb	Add count to Themes and ColorSchemes	2015-08-26 11:30:38 -07:00
upgrader.rb	Replace all usages of git command with configurable binary path	2015-11-03 17:11:09 -05:00
uploads_transfer.rb	Fix: Images cannot show when projects' path was changed	2015-10-14 18:50:35 +03:00
url_builder.rb	Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g	2015-09-09 14:56:02 +02:00
user_access.rb	Cache LDAP check in Gitlab::UserAccess	2014-08-06 18:03:01 +02:00
utils.rb	add common method to force utf8 and force oauth properties to be utf8	2015-05-03 00:43:46 +03:00
version_info.rb	Fix abort gitlab:app:check	2013-06-06 10:10:51 +09:00
visibility_level.rb	Fix GitlabV::isibilityLevel::level_name method	2015-11-04 22:13:40 +01:00