Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42

1 files changed, 0 insertions, 17 deletions

diff --git a/app/models/metrics/dashboard/annotation.rb b/app/models/metrics/dashboard/annotation.rb
index d3d3f973398..ac0fcb41089 100644
--- a/app/models/metrics/dashboard/annotation.rb
+++ b/app/models/metrics/dashboard/annotation.rb
@@ -7,15 +7,10 @@ module Metrics
 
       self.table_name = 'metrics_dashboard_annotations'
 
-      belongs_to :environment, inverse_of: :metrics_dashboard_annotations
-      belongs_to :cluster, class_name: 'Clusters::Cluster', inverse_of: :metrics_dashboard_annotations
-
       validates :starting_at, presence: true
       validates :description, presence: true, length: { maximum: 255 }
       validates :dashboard_path, presence: true, length: { maximum: 255 }
       validates :panel_xid, length: { maximum: 255 }
-      validate :single_ownership
-      validate :orphaned_annotation
       validate :ending_at_after_starting_at
 
       scope :after, ->(after) { where('starting_at >= ?', after) }
@@ -34,18 +29,6 @@ module Metrics
 
         errors.add(:ending_at, s_("MetricsDashboardAnnotation|can't be before starting_at time"))
       end
-
-      def single_ownership
-        return if cluster.nil? ^ environment.nil?
-
-        errors.add(:base, s_("MetricsDashboardAnnotation|Annotation can't belong to both a cluster and an environment at the same time"))
-      end
-
-      def orphaned_annotation
-        return if cluster.present? || environment.present?
-
-        errors.add(:base, s_("MetricsDashboardAnnotation|Annotation must belong to a cluster or an environment"))
-      end
     end
   end
 end