delta/gitlab/gitlab-ce.git/config/gitlab.yml.example, branch 3870-commit-sorting-issue

Use the new admin settings for gravatar

2016-05-04T15:45:29+00:00

Merge branch 'admin-email-frequency' into 'master'

2016-04-28T11:07:42+00:00


Send 'admin emails' weekly, not daily

Daily seems to be to spammy, so let's default to weekly instead.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15520

See merge request !3923

Backport GitHub Enterprise import support from EE

2016-04-27T04:00:55+00:00

These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.

Send 'admin emails' weekly, not daily

2016-04-26T09:54:37+00:00

Daily seems to be to spammy, so let's default to weekly instead.

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