diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-11 04:43:52 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-11 04:50:42 +0300 |
| commit | 26107e93548c0b9dee7df0a7e4003f1d55be1975 (patch) | |
| tree | 350b9cc7aac3c0b7a05afd907d2d4d4fbc09d6f2 /lib/gitlab/import_export | |
| parent | ea671dec7f9db06c1d45ddd1536c1af194de8f62 (diff) | |
Properly save suggestions in project exports
Previously imports would fail if a merge request note included a
suggestion with an
`ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection`
exception.
This was happening because suggestions were listed as a descendant of
merge requests, but this doesn't work because suggestions are directly
associated with notes, not merge requests, and that association is lost.
Rails also disallows creating intializing a has_many association through
a different object.
We fix this by making `suggestions` a child of `notes` within a merge
request. This doesn't fix previously broken exported project exports,
but new exports will work.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65880
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index f3888857bb6..1b7fc5fa10f 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -37,11 +37,11 @@ project_tree: - :user - merge_requests: - :metrics - - :suggestions - notes: - :author - events: - :push_event_payload + - :suggestions - merge_request_diff: - :merge_request_diff_commits - :merge_request_diff_files |