diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-23 15:01:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-23 15:01:30 +0000 |
| commit | ad70fb7bdc7a95f99267e88335b2241d6c9feff0 (patch) | |
| tree | b263071adc3e21aa99c26001c8279115285e04a8 /lib/gitlab | |
| parent | 038f5a412d0085f2d9610c77cea37cec75572b27 (diff) | |
| parent | 991bf24ec8890eca248a00deb4f33f309c9ffb83 (diff) | |
| download | gitlab-ce-ad70fb7bdc7a95f99267e88335b2241d6c9feff0.tar.gz | |
Merge branch 'use-merge-requests-diff-id-column' into 'master'
Use foreign key to get latest MR diff
Closes #37631
See merge request gitlab-org/gitlab-ce!15126
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/import_export/project_tree_restorer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb index 639f4f0c3f0..c518943be59 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -60,6 +60,8 @@ module Gitlab end end + @project.merge_requests.set_latest_merge_request_diff_ids! + @saved end |