diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-11-02 16:58:26 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-11-02 16:58:26 +0000 |
| commit | 52115b905a72030afd536922389ed42991aec4cb (patch) | |
| tree | 83984696918b5e38b19c485018704e72fe6a651e /app | |
| parent | 64c9d7805d80537600251d5f6e1b5a32d4b6d1c0 (diff) | |
| parent | 4768a1e26f70263be24ac681042507fe01218b9b (diff) | |
| download | gitlab-ce-52115b905a72030afd536922389ed42991aec4cb.tar.gz | |
Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' into 'master'
Resolve "Add a `merge_request_diff_id` column to `merge_requests`"
See merge request gitlab-org/gitlab-ce!15035
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index faf0b95f842..1eda0f9cbbd 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -48,6 +48,10 @@ class MergeRequestDiff < ActiveRecord::Base # Collect information about commits and diff from repository # and save it to the database as serialized data def save_git_content + MergeRequest + .where('id = ? AND COALESCE(latest_merge_request_diff_id, 0) < ?', self.merge_request_id, self.id) + .update_all(latest_merge_request_diff_id: self.id) + ensure_commit_shas save_commits save_diffs |