import uploads. Fixed a few things to do with members, triggers, etc...

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index d4e49ae17f0..566777e8fc9 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -12,7 +12,7 @@ module Gitlab
                     builds: 'Ci::Build',
                     hooks: 'ProjectHook' }.freeze
 
-      USER_REFERENCES = %w(author_id assignee_id updated_by_id).freeze
+      USER_REFERENCES = %w(author_id assignee_id updated_by_id user_id).freeze
 
       def create(relation_sym:, relation_hash:, members_mapper:, user_admin:)
         relation_sym = parse_relation_sym(relation_sym)
@@ -21,6 +21,7 @@ module Gitlab
         update_missing_author(relation_hash, members_mapper, user_admin) if relation_sym == :notes
         update_user_references(relation_hash, members_mapper.map)
         update_project_references(relation_hash, klass)
+        reset_tokens(relation_hash) if relation_sym == 'Ci::Trigger'
 
         generate_imported_object(klass, relation_hash, relation_sym)
       end
@@ -88,6 +89,13 @@ module Gitlab
         relation_hash['gl_project_id'] = project_id if relation_hash ['gl_project_id']
       end
 
+      def reset_tokens(relation_hash)
+        return unless Gitlab::ImportExport.reset_tokens?
+
+        # If we import/export a project to the same instance, tokens will have to be reseated.
+        relation_hash['token'] = nil
+      end
+
       def relation_class(relation_sym)
         relation_sym.to_s.classify.constantize
       end