Fix merge requests not importing for older projects

What does this MR do and why?

This restores the merge request commit user fields in import_export.yml for the import case.

!73307 (diffs, comment 717747876) dropped these YAML fields because supposedly the import would fail if the database columns didn't exist, but I haven't found that to be the case. I tested with an import with:

  1. Project generated in v13.12 that had these columns.
  2. Project generated with the latest nightly build.

The import works in either case because we call MergeRequestDiffCommit.new with the sanitized attributes in !73307 (merged).

Based on the discussion in !72219 (comment 707544986) these attributes are needed for import but excluded for export. I think Yorick might have assumed that since the code in !73307 (diffs) manually removed these fields, we wouldn't need them anymore. However, without these attributes, imports were failing to import with an older GitLab version (e.g. v13.12) because the attributes were sanitized before the importer got a chance to use them.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Stan Hu

Merge request reports

Loading