Rémy CoutableandYorick Peterse 0034e4f398 Merge branch 'trusted-proxies-ip-addr' into 'master' ...

Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17004

See merge request !3970

2016-05-11 11:00:11 +02:00

..

environments

Enable asset compression in production.

2016-04-09 16:31:41 -06:00

initializers

Merge branch 'trusted-proxies-ip-addr' into 'master'

2016-05-11 11:00:11 +02:00

locales

Implement new UI for pagination

2016-01-20 21:27:01 -05:00

application.rb

Put CACHE_NAMESPACE in the Gitlab::Redis module

2016-04-07 15:42:07 +02:00

aws.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

boot.rb

init commit

2011-10-09 00:36:38 +03:00

database.yml.env

Improving the "Environment variables" administration doc

2016-02-01 19:10:46 +01:00

database.yml.mysql

set the collation to utf8_general_ci

2014-08-13 14:45:23 +01:00

database.yml.postgresql

Remove 'socket' example PostgreSQL parameter

2014-07-01 18:27:50 +02:00

environment.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

gitlab.teatro.yml

Revert "Allow to configure smtp and sendmail in gitlab.yml"

2015-05-06 17:39:18 +03:00

gitlab.yml.example

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

2016-04-13 17:38:59 +02:00

mail_room.yml

Add Gitlab::Redis connection pool

2016-04-04 17:00:09 +02:00

newrelic.yml

Revert "Remove newrelic gem. Closes #12860"

2016-02-23 07:25:37 -08:00

resque.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

routes.rb

Merge remote-tracking branch 'dev/8-7-stable' into 8-7-stable

2016-05-02 20:00:11 -04:00

secrets.yml.example

Groundwork for merging CI into CE

2015-08-25 18:42:46 -07:00

sidekiq.yml.example

bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this

2016-02-18 18:58:51 +00:00

unicorn.rb.example

Fix typos and grammar

2016-02-10 12:43:19 +02:00

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

2014-09-23 17:11:16 +03:00