diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 09:07:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 09:07:51 +0300 |
| commit | 4411353300cf8219d2b899785bc5103c549ba8cf (patch) | |
| tree | 07088034176e9cf9fbbed39bf33001cf56319381 /app/models/clusters/concerns | |
| parent | c3bcd285f88d6444a043c0c4f653e3749ec60d75 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters/concerns')
| -rw-r--r-- | app/models/clusters/concerns/application_core.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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? |