From 0434f38ef1dce4fe640fe1e4542235746ceb943c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 31 Jan 2020 18:09:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/prometheus_metric.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/models/prometheus_metric.rb') diff --git a/app/models/prometheus_metric.rb b/app/models/prometheus_metric.rb index d0dc31476ff..571b586056b 100644 --- a/app/models/prometheus_metric.rb +++ b/app/models/prometheus_metric.rb @@ -2,6 +2,7 @@ class PrometheusMetric < ApplicationRecord belongs_to :project, validate: true, inverse_of: :prometheus_metrics + has_many :prometheus_alerts, inverse_of: :prometheus_metric enum group: PrometheusMetricEnums.groups @@ -73,5 +74,3 @@ class PrometheusMetric < ApplicationRecord PrometheusMetricEnums.group_details.fetch(group.to_sym) end end - -PrometheusMetric.prepend_if_ee('EE::PrometheusMetric') -- cgit v1.2.3