summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/unreleased/fix-import-export-mr-error.yml4
-rw-r--r--lib/gitlab/import_export/relation_factory.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-import-export-mr-error.yml b/changelogs/unreleased/fix-import-export-mr-error.yml
new file mode 100644
index 00000000000..e1137bca131
--- /dev/null
+++ b/changelogs/unreleased/fix-import-export-mr-error.yml
@@ -0,0 +1,4 @@
+---
+title: Fix Import/Export merge requests error while importing
+merge_request:
+author:
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index a0e80fccad9..66e54e86ea9 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -14,7 +14,7 @@ module Gitlab
priorities: :label_priorities,
label: :project_label }.freeze
- USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id].freeze
+ USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id merge_user_id].freeze
PROJECT_REFERENCES = %w[project_id source_project_id gl_project_id target_project_id].freeze