Rémy Coutable 7d95d3cde7 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-09 09:47:16 +00:00

..

config

Don't load all of GitLab in mail_room

2016-02-26 18:48:13 -08:00

controllers

Merge remote-tracking branch 'dev/master' into 'master'

2016-05-02 19:58:54 -04:00

factories

Backported minimal safewebhook implementation to GitLab CE

2016-04-30 05:04:10 -03:00

features

Use outer join for issues ordering by milestones due.

2016-05-06 19:57:26 +09:00

finders

Return unique issues when using multiple labels

2016-04-13 16:10:49 -04:00

fixtures

Update SVG sanitizer to conform to SVG 1.1

2016-05-06 23:20:24 -07:00

helpers

Update SVG sanitizer to conform to SVG 1.1

2016-05-06 23:20:24 -07:00

initializers

Add tests for setting trusted_proxies

2016-05-04 15:49:39 -07:00

javascripts

Fix build notification on merge request page change even if the build status didn't change

2016-05-08 21:41:09 +02:00

lib

Merge branch 'fix/import-url-issues' into 'master'

2016-05-05 22:27:40 +00:00

mailers

Merge branch 'mr-formatting' into 'master'

2016-04-19 16:23:41 +00:00

models

Merge branch 'use-rugged-to-create-tag' into 'master'

2016-05-04 16:07:13 +00:00

requests

Merge branch 'use-rugged-to-create-tag' into 'master'

2016-05-04 16:07:13 +00:00

routing

Remove Profile::KeysController#new action

2016-03-03 16:13:59 -05:00

services

Escape HTML in commit titles in system note messages

2016-05-07 08:41:10 -07:00

support

Ensure URL in all Service subclasses are valid

2016-04-25 15:28:24 -04:00

tasks/gitlab

Ensure uploads dir exists when running backup specs

2016-03-30 15:40:49 +02:00

views

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

workers

Merge branch 'create-wikis-during-check' into 'master'

2016-05-04 14:10:49 +00:00

factories_spec.rb

Add support for not Active Record based factories

2016-03-30 10:44:18 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Update rspec-rails from 3.3.3 to 3.4.2.

2016-05-01 13:44:50 -06:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00