Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 49b8ab760f3..3dafe7c8962 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -92,15 +92,15 @@ module Gitlab
       def import_issues
         return unless repo.issues_enabled?
 
-        # If a user creates an issue while the import is in progress, this can lead to an import failure.
-        # The workaround is to allocate IIDs before starting the importer.
-        allocate_issues_internal_id!(project, client)
-
         create_labels
 
         issue_type_id = ::WorkItems::Type.default_issue_type.id
 
-        client.issues(repo).each do |issue|
+        client.issues(repo).each_with_index do |issue, index|
+          # If a user creates an issue while the import is in progress, this can lead to an import failure.
+          # The workaround is to allocate IIDs before starting the importer.
+          allocate_issues_internal_id!(project, client) if index == 0
+
           import_issue(issue, issue_type_id)
         end
       end