diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 03:09:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 03:09:51 +0300 |
commit | 6b75388b67c35271bc18f2dbd41a72accd927808 (patch) | |
tree | 0e905919b117b731ea22ef629f45701e6124c1ee /lib/gitlab/octokit | |
parent | 260c87f94ecc8802de4f7cd16d10c0a08d19559c (diff) |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
Diffstat (limited to 'lib/gitlab/octokit')
-rw-r--r-- | lib/gitlab/octokit/middleware.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/gitlab/octokit/middleware.rb b/lib/gitlab/octokit/middleware.rb index 0e47672bb3c..a92860f7eb8 100644 --- a/lib/gitlab/octokit/middleware.rb +++ b/lib/gitlab/octokit/middleware.rb @@ -11,8 +11,7 @@ module Gitlab Gitlab::UrlBlocker.validate!(env[:url], schemes: %w[http https], allow_localhost: allow_local_requests?, - allow_local_network: allow_local_requests?, - dns_rebind_protection: dns_rebind_protection? + allow_local_network: allow_local_requests? ) @app.call(env) @@ -23,10 +22,6 @@ module Gitlab def allow_local_requests? Gitlab::CurrentSettings.allow_local_requests_from_web_hooks_and_services? end - - def dns_rebind_protection? - Gitlab::CurrentSettings.dns_rebinding_protection_enabled? - end end end end |