Commit 1bd74839 authored by Yorick Peterse's avatar Yorick Peterse

Resolved conflicts in Issue/Project models

parent ae367335
......@@ -39,12 +39,9 @@ class Issue < ActiveRecord::Base
has_many :issue_assignees
has_many :assignees, class_name: "User", through: :issue_assignees
<<<<<<< HEAD
has_one :epic_issue
has_one :epic, through: :epic_issue
=======
>>>>>>> upstream/master
validates :project, presence: true
......
......@@ -205,11 +205,8 @@ class Project < ActiveRecord::Base
has_one :cluster_project, class_name: 'Clusters::Project'
has_many :clusters, through: :cluster_project, class_name: 'Clusters::Cluster'
<<<<<<< HEAD
has_many :prometheus_metrics
=======
>>>>>>> upstream/master
# Container repositories need to remove data from the container registry,
# 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