diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-13 18:03:12 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-13 18:03:12 +0000 |
| commit | c048422fa23b988ecdb87858cd58766870347bbe (patch) | |
| tree | c07a1507ff5192f911704fcc77026d7f4043dd0e /config | |
| parent | 42b7f53bb8c456e2a88f6abff1ea8fc5dc5c4b2e (diff) | |
| parent | 9f05e97aad33a0cd70862f67101bdcb3fddc639a (diff) | |
| download | gitlab-ce-c048422fa23b988ecdb87858cd58766870347bbe.tar.gz | |
Merge branch 'update-rubocop' into 'master'
Update rubocop target ruby version
See merge request gitlab-org/gitlab-ce!24804
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/trusted_proxies.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb index 7af465d8443..13896408806 100644 --- a/config/initializers/trusted_proxies.rb +++ b/config/initializers/trusted_proxies.rb @@ -14,10 +14,8 @@ module Rack end gitlab_trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy| - begin - IPAddr.new(proxy) - rescue IPAddr::InvalidAddressError - end + IPAddr.new(proxy) +rescue IPAddr::InvalidAddressError end.compact Rails.application.config.action_dispatch.trusted_proxies = ( |