diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-08 03:09:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-08 03:09:06 +0300 |
| commit | dcdc526104295b8922b27fd806ae8c3b262cbad9 (patch) | |
| tree | b641e4136dea04bb0a62833274101c07e9920053 /app/models | |
| parent | e49bd57279b72cf517853aec369e341fa3442d60 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/clusters/cluster.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index bfa97425dbb..d4f5d499b65 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -337,7 +337,7 @@ module Clusters end def local_tiller_enabled? - Feature.enabled?(:managed_apps_local_tiller, clusterable, default_enabled: false) + Feature.enabled?(:managed_apps_local_tiller, clusterable, default_enabled: true) end private |