summaryrefslogtreecommitdiff
path: root/app/models/merge_request
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-12-07 15:41:30 -0200
committerOswaldo Ferreira <oswaldo@gitlab.com>2018-01-02 17:45:25 -0200
commitbf8c20729baffbf55605484230ff33680d72139b (patch)
tree70d9bea9ea2a37dc8cd8c37cda396fcf246db72b /app/models/merge_request
parent2cbb2d0eceaed0f31c92d4eed8932e98f4f74559 (diff)
downloadgitlab-ce-bf8c20729baffbf55605484230ff33680d72139b.tar.gz
Cache merged and closed events data in merge_request_metrics table
Diffstat (limited to 'app/models/merge_request')
-rw-r--r--app/models/merge_request/metrics.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/app/models/merge_request/metrics.rb b/app/models/merge_request/metrics.rb
index cdc408738be..9e660eccd86 100644
--- a/app/models/merge_request/metrics.rb
+++ b/app/models/merge_request/metrics.rb
@@ -1,12 +1,6 @@
class MergeRequest::Metrics < ActiveRecord::Base
belongs_to :merge_request
belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :pipeline_id
-
- def record!
- if merge_request.merged? && self.merged_at.blank?
- self.merged_at = Time.now
- end
-
- self.save
- end
+ belongs_to :latest_closed_by, class_name: 'User'
+ belongs_to :merged_by, class_name: 'User'
end