delta/gitlab/gitlab-ce.git/config, 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 'async-related-mrs' into 'master'

2016-04-13T16:06:36+00:00


Load related MRs/branches asynchronously

cc @dzaporozhets 

See merge request !3678

Load related MRs/branches asynchronously

2016-04-13T15:24:21+00:00

Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949

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

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

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

Merge branch 'decouple-member-notification' into 'master'

2016-04-12T16:39:40+00:00


Decouple membership and notifications

This allow you to have notification setting per project even if you are member of group. 
It also creates background for having notification settings in project you are not member of. 


- [x] Make it work
- [x] Migrations
- [x] CHANGELOG
- [x] More tests
- [x] API

For #3359 

After this merge request there is still some work to be done: 

* create migration that remove duplicates in notification settings table and create uniq index (8.8 probably)
* remove notification_level field from Member model in 9.0
* make proper API for notification settings
* use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) 
* maybe more tests 


Signed-off-by: Dmitriy Zaporozhets 

See merge request !3421

Move RepositoryArchiveCacheWorker to sidekiq-cron

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

Closes #15105