diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-08-06 15:07:18 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-08-06 15:07:18 +1000 |
| commit | fc77b9df8b6a49c86e9c1eb949f1b1162470d2ee (patch) | |
| tree | 96aad0a31543fa520626dc1c5efabff1367a0bab /lib/gitlab/kubernetes/kube_client.rb | |
| parent | 9c71bf3e6df2dcb20ea19df21a127823bbe5e615 (diff) | |
| parent | fa216b0e86433192ba4e39a05f42217fb4685173 (diff) | |
| download | gitlab-ce-fc77b9df8b6a49c86e9c1eb949f1b1162470d2ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into alerts-dropdown-to-modal-part-2-cealerts-dropdown-to-modal-part-2-ce
Diffstat (limited to 'lib/gitlab/kubernetes/kube_client.rb')
| -rw-r--r-- | lib/gitlab/kubernetes/kube_client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/kubernetes/kube_client.rb b/lib/gitlab/kubernetes/kube_client.rb index 1350924cd76..64317225ec6 100644 --- a/lib/gitlab/kubernetes/kube_client.rb +++ b/lib/gitlab/kubernetes/kube_client.rb @@ -128,7 +128,7 @@ module Gitlab private def validate_url! - return if Gitlab::CurrentSettings.allow_local_requests_from_hooks_and_services? + return if Gitlab::CurrentSettings.allow_local_requests_from_web_hooks_and_services? Gitlab::UrlBlocker.validate!(api_prefix, allow_local_network: false) end |