diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-06-18 02:31:36 +0300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-18 02:31:36 +0300 |
| commit | 04307096bcc776259d8080bebd688ff6073d07c4 (patch) | |
| tree | efaedddc5c9a6b330aaa7c979d882fcf4cb5a869 /app | |
| parent | 11acaf023e0027a88fec63696ba649ecc3eae9b2 (diff) | |
| parent | c234e7312357388c1e088876772ecae22cf06297 (diff) | |
Merge branch 'migrate_k8s_service_integration' into 'master'
Migrate Kubernetes service integration templates to clusters
See merge request gitlab-org/gitlab-ce!28534
Diffstat (limited to 'app')
| -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 0206ce81c5f..8c044c86c47 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -226,7 +226,7 @@ module Clusters end def allow_user_defined_namespace? - project_type? + project_type? || !managed? end def kube_ingress_domain |