diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-19 21:03:06 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-21 15:54:20 +0300 |
| commit | c424836a076c06486e1a16760f5cceefb86d18ff (patch) | |
| tree | 621ec79cebd19332eda63f0f780cf4b54abddbf2 /lib/gitlab | |
| parent | cea7efe5f9a07e73bddb7570d5e0bc3f73ce817b (diff) | |
Merge branch 'fix/import-export-mr-error' into 'master'
Fix import/export merge requests error
When MWBS is set and the MR exported/imported an error gets thrown. We should ignore this so it can succeed as the merge user may no longer exist in the target instance.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24009 and https://gitlab.com/gitlab-com/support-forum/issues/1345
See merge request !8134
Diffstat (limited to 'lib/gitlab')
| -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 |