delta/gitlab/gitlab-ce.git/config/gitlab.yml.example, branch parallel-diff-alignment

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck

2016-04-13T15:38:59+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

Add changelog entries, install docs, and gitlab.yml.example entry for the trusted_proxies setting

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

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck

2016-04-12T15:44:02+00:00

Move RepositoryArchiveCacheWorker to sidekiq-cron

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

Closes #15105

Documentation of feature

2016-04-11T15:16:56+00:00

Remove dumb debug statement and add many tests.

2016-04-07T12:47:29+00:00

Added documentation

2016-04-06T21:04:11+00:00

Rename almost all the things

2016-04-06T11:47:05+00:00