diff options
| author | James Lopez <james@jameslopez.es> | 2016-11-15 15:22:35 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-11-17 08:22:58 +0100 |
| commit | ca6da6ea3034a58c0edbc62336d2d49ea6e11fc9 (patch) | |
| tree | 91e9bb0520f6310b210e26b70d88fc779fdbe4c7 /app/models/merge_request | |
| parent | 73e9ec631995d5ed91a3eb5e8416c924e7d7c5ad (diff) | |
| download | gitlab-ce-ca6da6ea3034a58c0edbc62336d2d49ea6e11fc9.tar.gz | |
Renamed pipeline column and fixed permissions for builds in events controller
Diffstat (limited to 'app/models/merge_request')
| -rw-r--r-- | app/models/merge_request/metrics.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request/metrics.rb b/app/models/merge_request/metrics.rb index 7d19943769e..cdc408738be 100644 --- a/app/models/merge_request/metrics.rb +++ b/app/models/merge_request/metrics.rb @@ -1,6 +1,6 @@ class MergeRequest::Metrics < ActiveRecord::Base belongs_to :merge_request - belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :ci_commit_id + belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :pipeline_id def record! if merge_request.merged? && self.merged_at.blank? |