diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-30 11:01:14 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-30 11:01:14 +0000 |
| commit | feece7713247a063bfa71ab701f8a164e6fa71bb (patch) | |
| tree | a1de74f546c74cee85b4c5520e9de8ed45451048 /app/models/ci | |
| parent | 41aa9fa7362d213e469c6aa9021abd0569e9f332 (diff) | |
| parent | 7277b3b32c2afd26a033ecf81b93319efb65861d (diff) | |
| download | gitlab-ce-feece7713247a063bfa71ab701f8a164e6fa71bb.tar.gz | |
Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master'
Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector.
See merge request gitlab-org/gitlab-ce!15515
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index ebbefc51a4f..fd64670f6b0 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -365,7 +365,7 @@ module Ci end def has_kubernetes_active? - project.kubernetes_service&.active? + project.deployment_platform&.active? end def has_stage_seeds? |