diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 18:09:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 18:09:19 +0000 |
| commit | 3290d46655f07d7ae3dca788d6df9f326972ffd8 (patch) | |
| tree | 0d24713e1592cdd3583257f14a52d46a22539ed1 /app/models/clusters | |
| parent | c6b3ec3f56fa32a0e0ed3de0d0878d25f1adaddf (diff) | |
| download | gitlab-ce-3290d46655f07d7ae3dca788d6df9f326972ffd8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/cluster.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index 78efe2b4337..42771eaa82a 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -59,6 +59,7 @@ module Clusters has_one_cluster_application :elastic_stack has_many :kubernetes_namespaces + has_many :metrics_dashboard_annotations, class_name: 'Metrics::Dashboard::Annotation', inverse_of: :cluster accepts_nested_attributes_for :provider_gcp, update_only: true accepts_nested_attributes_for :provider_aws, update_only: true |