summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-03-13 13:42:43 +0000
committerNick Thomas <nick@gitlab.com>2019-03-13 13:42:43 +0000
commit9f05e97aad33a0cd70862f67101bdcb3fddc639a (patch)
treea9868d2c6711ebff1dcbb06f6d09f91d15caa631 /config
parent5ed9c5f7f74d7305bb884a6ae7a601d4563398a4 (diff)
downloadgitlab-ce-9f05e97aad33a0cd70862f67101bdcb3fddc639a.tar.gz
Run rubocop -a
Diffstat (limited to 'config')
-rw-r--r--config/initializers/trusted_proxies.rb6
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 = (