diff options
| author | James Lopez <james@jameslopez.es> | 2016-12-16 09:13:58 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-12-19 16:52:38 +0100 |
| commit | 0631c7bcdce5dcb2aac94b1b755e63022a62469f (patch) | |
| tree | 2b65d4d82df50aa5584ef0f4095efa0b813ad67f /lib/gitlab/import_export | |
| parent | 01adeb17acccab09eb0074725050356d9d431c8a (diff) | |
| download | gitlab-ce-0631c7bcdce5dcb2aac94b1b755e63022a62469f.tar.gz | |
Fix MR issue to do with merge user
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |