diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-27 12:58:41 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-27 12:58:41 +0300 |
| commit | 6b02f502c84450d5e23866fef0d3da600d7c78ae (patch) | |
| tree | 4ca55b589534d36471fb0cea96a50afca8603cea /app/models/clusters/platforms | |
| parent | 2b6bdbe671d5b650ce38b8f2a6cfd814c8d519d7 (diff) | |
| parent | 6d4c2529f94e7d96a456cf14d8f5187087637f32 (diff) | |
Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into 'master'
Handle nil terminals in Clusters::Platforms::Kubernetes
Closes #55551
See merge request gitlab-org/gitlab-ce!23925
Diffstat (limited to 'app/models/clusters/platforms')
| -rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 6cec497b4e4..0dc0c4f80d6 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -106,7 +106,7 @@ module Clusters def terminals(environment) with_reactive_cache do |data| pods = filter_by_label(data[:pods], app: environment.slug) - terminals = pods.flat_map { |pod| terminals_for_pod(api_url, actual_namespace, pod) } + terminals = pods.flat_map { |pod| terminals_for_pod(api_url, actual_namespace, pod) }.compact terminals.each { |terminal| add_terminal_auth(terminal, terminal_auth) } end end |