Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/gitlab/fogbugz_import/project_creator.rb b/lib/gitlab/fogbugz_import/project_creator.rb
index 841f9de8d4a..a5e6356eb17 100644
--- a/lib/gitlab/fogbugz_import/project_creator.rb
+++ b/lib/gitlab/fogbugz_import/project_creator.rb
@@ -3,22 +3,23 @@
 module Gitlab
   module FogbugzImport
     class ProjectCreator
-      attr_reader :repo, :fb_session, :namespace, :current_user, :user_map
+      attr_reader :repo, :name, :fb_session, :namespace, :current_user, :user_map
 
-      def initialize(repo, fb_session, namespace, current_user, user_map = nil)
+      def initialize(repo, name, namespace, current_user, fb_session, user_map = nil)
         @repo = repo
-        @fb_session = fb_session
+        @name = name
         @namespace = namespace
         @current_user = current_user
+        @fb_session = fb_session
         @user_map = user_map
       end
 
       def execute
         ::Projects::CreateService.new(
           current_user,
-          name: repo.safe_name,
-          path: repo.path,
-          namespace: namespace,
+          name: name,
+          path: name,
+          namespace_id: namespace.id,
           creator: current_user,
           visibility_level: Gitlab::VisibilityLevel::PRIVATE,
           import_type: 'fogbugz',