Skip to content

G
gitlab-ce
Commit fb10506b authored by Sean McGivern's avatar Sean McGivern
Browse files
Options

Fix conflicts in project model

parent c95477a9
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/project.rb
View file @ fb10506b
...@@ -205,11 +205,8 @@ class Project < ActiveRecord::Base ...@@ -205,11 +205,8 @@ class Project < ActiveRecord::Base
has_one :cluster_project, class_name: 'Clusters::Project' has_one :cluster_project, class_name: 'Clusters::Project'
has_many :clusters, -> { auto_include(false) }, through: :cluster_project, class_name: 'Clusters::Cluster' has_many :clusters, -> { auto_include(false) }, through: :cluster_project, class_name: 'Clusters::Cluster'
<<<<<<< HEAD
has_many :prometheus_metrics has_many :prometheus_metrics
=======
>>>>>>> upstream/master
# Container repositories need to remove data from the container registry, # Container repositories need to remove data from the container registry,
# which is not managed by the DB. Hence we're still using dependent: :destroy # which is not managed by the DB. Hence we're still using dependent: :destroy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7