diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
| commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
| tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/models/clusters | |
| parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/applications/prometheus.rb | 2 | ||||
| -rw-r--r-- | app/models/clusters/cluster.rb | 2 | ||||
| -rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb index f31a6b8b50e..7a414d1a5bb 100644 --- a/app/models/clusters/applications/prometheus.rb +++ b/app/models/clusters/applications/prometheus.rb @@ -117,3 +117,5 @@ module Clusters end end end + +Clusters::Applications::Prometheus.prepend_if_ee('EE::Clusters::Applications::Prometheus') diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index a976093ac0c..7855fb69bd6 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -268,3 +268,5 @@ module Clusters end end end + +Clusters::Cluster.prepend_if_ee('EE::Clusters::Cluster') diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 37614fbe3ca..89b50d8e8ff 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -201,3 +201,5 @@ module Clusters end end end + +Clusters::Platforms::Kubernetes.prepend_if_ee('EE::Clusters::Platforms::Kubernetes') |