diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-23 00:08:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-23 00:08:53 +0300 |
commit | 386dcdbe9d3cef9d5fa79c4582a722db27fe2c57 (patch) | |
tree | a0719a1794b21fedf33ab51a4052b8b9c0f7b573 /lib/gitlab/kubernetes/kube_client.rb | |
parent | a9a2f9257eae40935e03ca4185d5263bcb7ba45f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/kubernetes/kube_client.rb')
-rw-r--r-- | lib/gitlab/kubernetes/kube_client.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/kubernetes/kube_client.rb b/lib/gitlab/kubernetes/kube_client.rb index 44e53e9ec70..593090902e7 100644 --- a/lib/gitlab/kubernetes/kube_client.rb +++ b/lib/gitlab/kubernetes/kube_client.rb @@ -161,7 +161,11 @@ module Gitlab def validate_url! return if Gitlab::CurrentSettings.allow_local_requests_from_web_hooks_and_services? - Gitlab::UrlBlocker.validate!(api_prefix, allow_local_network: false, schemes: %w[http https]) + Gitlab::HTTP_V2::UrlBlocker.validate!( + api_prefix, + allow_local_network: false, + schemes: %w[http https], + deny_all_requests_except_allowed: Gitlab::CurrentSettings.deny_all_requests_except_allowed?) end def service_account_exists?(resource) |