diff options
| author | James Lopez <james@jameslopez.es> | 2016-12-16 10:50:49 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-12-16 16:47:28 +0100 |
| commit | 3d9a82583e996fb928089ffb6bd9bb6ab995d3d1 (patch) | |
| tree | 2b65d4d82df50aa5584ef0f4095efa0b813ad67f | |
| parent | 4bafa2bbc283e8c63abafde8338ee9ebd29857d7 (diff) | |
| download | gitlab-ce-fix/import-export-mr-error.tar.gz | |
add missing changelog and filefix/import-export-mr-error
| -rw-r--r-- | changelogs/unreleased/fix-import-export-mr-error.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 2 |
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 |