diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-27 23:55:25 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-28 20:47:59 +0900 |
| commit | f6d9dcf8382a00a5f2ae2100b13774b01f0328bb (patch) | |
| tree | ff8145f559677bcf284cf68e39a97fba79af98a3 /app/models/clusters | |
| parent | c36d7842da24e6726705199f178c1324c634bdaf (diff) | |
| download | gitlab-ce-f6d9dcf8382a00a5f2ae2100b13774b01f0328bb.tar.gz | |
Fix unit tests
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 590d5da24cb..39b4f8f7bfc 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -6,7 +6,7 @@ module Clusters include ReactiveCaching self.table_name = 'cluster_platforms_kubernetes' - self.reactive_cache_key = ->(kubernetes) { [kubernetes.class.model_name.singular, kubernetes.cluster_id] } + self.reactive_cache_key = ->(kubernetes) { [kubernetes.class.model_name.singular, kubernetes.id] } belongs_to :cluster, inverse_of: :platform_kubernetes, class_name: 'Clusters::Cluster' @@ -41,6 +41,8 @@ module Clusters delegate :project, to: :cluster, allow_nil: true delegate :enabled?, to: :cluster, allow_nil: true + alias_method :active?, :enabled? + def actual_namespace if namespace.present? namespace |