diff options
| author | Andreas Brandl <abrandl@gitlab.com> | 2018-04-20 17:00:15 +0300 |
|---|---|---|
| committer | Yorick Peterse - OOO until May 4th <yorickpeterse@gmail.com> | 2018-04-20 17:00:15 +0300 |
| commit | 9ea2fc85a3387e7bbb10558b3f2302f05abe5b64 (patch) | |
| tree | 3a56fa83b93423314915c65d6ae549c98d78cacc /app/models/merge_request.rb | |
| parent | 87e592dc0a81d94efac157dfd7382df4e5b2a223 (diff) | |
Atomic internal ids for all models
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 91d8be5559b..8f964a488aa 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1,5 +1,5 @@ class MergeRequest < ActiveRecord::Base - include NonatomicInternalId + include AtomicInternalId include Issuable include Noteable include Referable @@ -18,6 +18,8 @@ class MergeRequest < ActiveRecord::Base belongs_to :source_project, class_name: "Project" belongs_to :merge_user, class_name: "User" + has_internal_id :iid, scope: :target_project, init: ->(s) { s&.target_project&.merge_requests&.maximum(:iid) } + has_many :merge_request_diffs has_one :merge_request_diff, |