diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 21:12:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 21:12:20 +0300 |
| commit | 3c4d101de003ea292be5ac5baf5d73c6c2747367 (patch) | |
| tree | 5918d12b69c4bfd84f05a585d62174586a80fd18 /lib/gitlab/url_blocker.rb | |
| parent | b2c21b99c7eb52b5fd906b1e7b4b08d4eb7a296c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/url_blocker.rb')
| -rw-r--r-- | lib/gitlab/url_blocker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb index de952b37b39..13504db0413 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -139,7 +139,7 @@ module Gitlab end def enforce_address_info_retrievable?(uri, dns_rebind_protection) - return false if !dns_rebind_protection || Gitlab.http_proxy_env? || domain_allowed?(uri) + return false if !dns_rebind_protection || domain_allowed?(uri) # In the test suite we use a lot of mocked urls that are either invalid or # don't exist. In order to avoid modifying a ton of tests and factories |