summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-11 06:09:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-11 06:09:46 +0000
commit55733b19c526145cceb120e8bb874d476a84383a (patch)
treedcde3cfb905516cd1f07ab364a94aff5fddff391 /app
parentea99abb145ed193c2ac5d19efbff3b8990a54c9c (diff)
downloadgitlab-ce-55733b19c526145cceb120e8bb874d476a84383a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/models/clusters/applications/prometheus.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index d24a298b0a6..adce55cb61b 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -99,6 +99,8 @@ module Clusters
def configured?
kube_client.present? && available?
+ rescue Gitlab::UrlBlocker::BlockedUrlError
+ false
end
private