Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/gitlab/import_export/base/relation_factory.rb b/lib/gitlab/import_export/base/relation_factory.rb
index 959ece4b903..30cd5ccfbcb 100644
--- a/lib/gitlab/import_export/base/relation_factory.rb
+++ b/lib/gitlab/import_export/base/relation_factory.rb
@@ -69,6 +69,7 @@ module Gitlab
         # the relation_hash, updating references with new object IDs, mapping users using
         # the "members_mapper" object, also updating notes if required.
         def create
+          return @relation_hash if author_relation?
           return if invalid_relation? || predefined_relation?
 
           setup_base_models
@@ -95,6 +96,10 @@ module Gitlab
           relation_class.try(:predefined_id?, @relation_hash['id'])
         end
 
+        def author_relation?
+          @relation_name == :author
+        end
+
         def setup_models
           raise NotImplementedError
         end