diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-10 15:08:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-10 15:08:57 +0300 |
| commit | a08f8baa63c0aea7fcf969da40d30e6cf56365cc (patch) | |
| tree | 57b5d1964407332189ce027bc3c99301b7a1f515 /lib/gitlab/url_blocker.rb | |
| parent | 01c201bc6a9b99e1f3095f4139110c6fd0cf7aa9 (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 a1c11b38f1a..eece2c343d2 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -113,7 +113,7 @@ module Gitlab end rescue SocketError # If the dns rebinding protection is not enabled or the domain - # is whitelisted we avoid the dns rebinding checks + # is allowed we avoid the dns rebinding checks return if domain_allowed?(uri) || !dns_rebind_protection # In the test suite we use a lot of mocked urls that are either invalid or |