diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-10 13:58:10 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-10 13:58:10 -0500 |
| commit | db25c17036b47cc4ee0bd08b7dc70def25d9a3c9 (patch) | |
| tree | e3cbcf3f34bf1ff043d5947bc0da434da8a4c0ca /config | |
| parent | 74520f23db51c95b4aea8856fb51c4246785f776 (diff) | |
| parent | e3911a1896d8725f7b739929b7de1ab09917eed5 (diff) | |
| download | gitlab-ce-db25c17036b47cc4ee0bd08b7dc70def25d9a3c9.tar.gz | |
Merge remote-tracking branch 'origin/master' into send-incremental-build-log
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.teatro.yml | 1 | ||||
| -rw-r--r-- | config/initializers/trusted_proxies.rb | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.teatro.yml b/config/gitlab.teatro.yml index f0656400beb..01c8dc5ff98 100644 --- a/config/gitlab.teatro.yml +++ b/config/gitlab.teatro.yml @@ -15,7 +15,6 @@ production: &base issues: true merge_requests: true wiki: true - wall: false snippets: false visibility_level: "private" # can be "private" | "internal" | "public" diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb index b8cc025bae2..d256a16d42b 100644 --- a/config/initializers/trusted_proxies.rb +++ b/config/initializers/trusted_proxies.rb @@ -1,2 +1,3 @@ -Rails.application.config.action_dispatch.trusted_proxies = +Rails.application.config.action_dispatch.trusted_proxies = ( [ '127.0.0.1', '::1' ] + Array(Gitlab.config.gitlab.trusted_proxies) +).map { |proxy| IPAddr.new(proxy) } |