summaryrefslogtreecommitdiff
path: root/app/models/merge_request
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-10-20 13:14:23 +0200
committerJames Lopez <james@jameslopez.es>2016-11-17 08:22:55 +0100
commit52e2729bf44ff3376071c2462679b46e9f67a44e (patch)
tree80df1a6370fe65ecd1fa83a66efe0fe8edf0e907 /app/models/merge_request
parent1a4ff5d720fa0ec65f925ef381fced3d5f9a040f (diff)
downloadgitlab-ce-52e2729bf44ff3376071c2462679b46e9f67a44e.tar.gz
add pipeline id to merge request metrics table. Also, updated the pipeline worker to populate this field.
Diffstat (limited to 'app/models/merge_request')
-rw-r--r--app/models/merge_request/metrics.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request/metrics.rb b/app/models/merge_request/metrics.rb
index 99c49a020c9..7d19943769e 100644
--- a/app/models/merge_request/metrics.rb
+++ b/app/models/merge_request/metrics.rb
@@ -1,5 +1,6 @@
class MergeRequest::Metrics < ActiveRecord::Base
belongs_to :merge_request
+ belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :ci_commit_id
def record!
if merge_request.merged? && self.merged_at.blank?