Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 12 insertions, 1 deletions

diff --git a/app/models/merge_request/metrics.rb b/app/models/merge_request/metrics.rb
index ba363019c72..66bff3f5982 100644
--- a/app/models/merge_request/metrics.rb
+++ b/app/models/merge_request/metrics.rb
@@ -1,10 +1,21 @@
 # frozen_string_literal: true
 
 class MergeRequest::Metrics < ApplicationRecord
-  belongs_to :merge_request
+  belongs_to :merge_request, inverse_of: :metrics
   belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :pipeline_id
   belongs_to :latest_closed_by, class_name: 'User'
   belongs_to :merged_by, class_name: 'User'
+
+  before_save :ensure_target_project_id
+
+  scope :merged_after, ->(date) { where(arel_table[:merged_at].gteq(date)) }
+  scope :merged_before, ->(date) { where(arel_table[:merged_at].lteq(date)) }
+
+  private
+
+  def ensure_target_project_id
+    self.target_project_id ||= merge_request.target_project_id
+  end
 end
 
 MergeRequest::Metrics.prepend_if_ee('EE::MergeRequest::Metrics')