summaryrefslogtreecommitdiff
path: root/app/models/clusters/applications
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-11-07 14:54:45 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-11-07 14:54:45 +0100
commit46bc6b5d8fd934823a28a358cb57b8e098352499 (patch)
tree57033bd2e1ef97099ae01521a8b38c9876e9e58b /app/models/clusters/applications
parent3cb4614273bfc10a6d3acc98d7a450dbe9f1aaaf (diff)
parent760a154a032319a90e15dcf4d54ec1c1cdde9e1c (diff)
downloadgitlab-ce-46bc6b5d8fd934823a28a358cb57b8e098352499.tar.gz
Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications
Diffstat (limited to 'app/models/clusters/applications')
-rw-r--r--app/models/clusters/applications/helm.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 0bbe5219715..7ea84841118 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -18,6 +18,8 @@ module Clusters
end
def set_initial_status
+ return unless not_installable?
+
self.status = 'installable' if cluster&.platform_kubernetes_active?
end