diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-15 16:33:06 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-15 16:33:06 +0000 |
commit | bdf279b151c2a530155425f352daac0576f1ec60 (patch) | |
tree | 6f0ce92e18056804697db30a718a13c085c02911 /app/models | |
parent | be5fdff13e001bcb644d447f6f74cce8b190c8c9 (diff) | |
parent | 46eeaafc255f9cc037f2656fcace67085519bf29 (diff) | |
download | gitlab-ce-bdf279b151c2a530155425f352daac0576f1ec60.tar.gz |
Merge branch '45584-add-nip-io-domain-suggestion-in-auto-devops' into 'master'
Resolve "Add nip.io domain suggestion in the Kubernetes cluster details view"
Closes #45584
See merge request gitlab-org/gitlab-ce!18496
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/project.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 32d34f5e9b8..534a0e630af 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -217,6 +217,7 @@ class Project < ActiveRecord::Base has_one :cluster_project, class_name: 'Clusters::Project' has_many :clusters, through: :cluster_project, class_name: 'Clusters::Cluster' + has_many :cluster_ingresses, through: :clusters, source: :application_ingress, class_name: 'Clusters::Applications::Ingress' # Container repositories need to remove data from the container registry, # which is not managed by the DB. Hence we're still using dependent: :destroy |