delta/gitlab/gitlab-ce.git/config/initializers, branch parallel-diff

Merge branch 'redis_config_consistency' into 'master'

2016-04-13T18:34:11+00:00


Redis configuration consistency

Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e

See merge request !3697

Redis configuration consistency

2016-04-13T17:57:19+00:00

Merge branch 'external-omniauth-providers' into 'master'

2016-04-13T13:09:47+00:00


Allow Omniauth providers to be marked as external

Related to #4009 

With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login.

MR for Omnibus: gitlab-org/omnibus-gitlab!727

/cc @dblessing @DouweM 

See merge request !3657

Merge branch 'rs-archive-cache-worker-cron' into 'master'

2016-04-13T12:53:01+00:00


Move RepositoryArchiveCacheWorker to sidekiq-cron

Closes #15105

See merge request !3663

Adjust the default trusted_proxies to only include localhost, and allow other trusted proxies to be configured.

2016-04-12T17:42:59+00:00

Move RepositoryArchiveCacheWorker to sidekiq-cron

2016-04-12T15:12:05+00:00

Closes #15105

Merge branch 'instrument-service-classes' into 'master'

2016-04-12T14:39:54+00:00


Instrument all service classes

This will help us see where (mostly) Sidekiq code is spending time.

See merge request !3675

Un-instrument Banzai::ReferenceExtractor

2016-04-12T12:10:35+00:00

Instrumenting this class together with Gitlab::ReferenceExtractor causes
a StackError for some reason. Since Gitlab::ReferenceExtractor has most
of the interesting code we'll only instrument that class.

Instrument all service classes

2016-04-12T10:24:16+00:00

Fixes gitlab-org/gitlab-ce#15162

Instrument Banzai code

2016-04-11T15:43:12+00:00