From 4411353300cf8219d2b899785bc5103c549ba8cf Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Jan 2020 06:07:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/clusters/concerns/application_core.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/clusters/concerns') diff --git a/app/models/clusters/concerns/application_core.rb b/app/models/clusters/concerns/application_core.rb index f6431f5bac3..b94f2b15846 100644 --- a/app/models/clusters/concerns/application_core.rb +++ b/app/models/clusters/concerns/application_core.rb @@ -15,7 +15,7 @@ module Clusters def set_initial_status return unless not_installable? - self.status = status_states[:installable] if cluster&.application_helm_available? + self.status = status_states[:installable] if cluster&.application_helm_available? || Feature.enabled?(:managed_apps_local_tiller) end def can_uninstall? -- cgit v1.2.3