Douwe Maan 49f51ff164 Merge branch 'optimize_ldap' into 'master' ...

Optimize LDAP and add a search timeout

Related to #4282 

This merge request arranges some things in `access.rb` to facilitate some optimizations in EE (to come later). It also adds a 10 second timeout to all LDAP searches so the entire worker is not blocked if some query doesn't return in a reasonable amount of time. This timeout is configurable per LDAP server.

See merge request !2267

2016-01-11 17:32:33 +00:00

..

api

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

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

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Backup LFS objects same as any upload.

2015-11-19 10:43:45 +01:00

banzai

Merge branch 'task-list-class' into 'master'

2016-01-07 20:10:07 +00:00

ci

Use method that creates runners registration token

2015-12-23 11:45:17 +01:00

gitlab

Merge branch 'optimize_ldap' into 'master'

2016-01-11 17:32:33 +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

Suggest prefacing find command with sudo when base permissions are wrong

2016-01-05 05:30:01 -08: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

Add email interceptor to prevent mail sending if email sending is disabled.

2014-10-27 13:05:50 +01:00

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

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07:00

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

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

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