diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-05-30 12:14:56 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-05-30 12:14:56 -0300 |
| commit | db926729660d66098db717ae9f64fab0cd2f601f (patch) | |
| tree | 137642f8faa77a62301c6cf3612093b497e39f46 | |
| parent | 54ad5fb8a2b9e90a83cd5714d935b8ea0664eb03 (diff) | |
| download | gitlab-ce-41587-osw-mr-metrics-migration-take-two.tar.gz | |
Ensure metrics regardless of being imported on MRs41587-osw-mr-metrics-migration-take-two
| -rw-r--r-- | app/models/concerns/issuable.rb | 2 | ||||
| -rw-r--r-- | app/models/issue.rb | 1 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index b45395343cc..44150b37708 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -97,8 +97,6 @@ module Issuable strip_attributes :title - after_save :ensure_metrics, unless: :imported? - # We want to use optimistic lock for cases when only title or description are involved # http://api.rubyonrails.org/classes/ActiveRecord/Locking/Optimistic.html def locking_enabled? diff --git a/app/models/issue.rb b/app/models/issue.rb index 0332bfa9371..57787815fae 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -59,6 +59,7 @@ class Issue < ActiveRecord::Base scope :public_only, -> { where(confidential: false) } after_save :expire_etag_cache + after_save :ensure_metrics, unless: :imported? attr_spammable :title, spam_title: true attr_spammable :description, spam_description: true diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index bc97fc3a5d9..79fc155fd3c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -58,6 +58,7 @@ class MergeRequest < ActiveRecord::Base after_create :ensure_merge_request_diff, unless: :importing? after_update :clear_memoized_shas after_update :reload_diff_if_branch_changed + after_save :ensure_metrics # When this attribute is true some MR validation is ignored # It allows us to close or modify broken merge requests |