Merge branch 'sh-fix-import-rake-task' into 'master'

Fix gitlab:import:repos Rake task moving repositories into the wrong location

Closes #40765

See merge request gitlab-org/gitlab-ce!15823

changelogs/unreleased/sh-fix-import-rake-task.yml

+---
+title: Fix gitlab:import:repos Rake task moving repositories into the wrong location
+merge_request:
+author:
+type: fixed

lib/gitlab/bare_repository_import/importer.rb

@@ -55,6 +55,7 @@ module Gitlab
                                               name: project_name,
                                               path: project_name,
                                               skip_disk_validation: true,
+                                              import_type: 'gitlab_project',
                                               namespace_id: group&.id).execute
 
         if project.persisted? && mv_repo(project)

lib/gitlab/bare_repository_import/repository.rb

@@ -7,6 +7,8 @@ module Gitlab
         @root_path = root_path
         @repo_path = repo_path
 
+        @root_path << '/' unless root_path.ends_with?('/')
+
         # Split path into 'all/the/namespaces' and 'project_name'
         @group_path, _, @project_name = repo_relative_path.rpartition('/')
       end

spec/lib/gitlab/bare_repository_import/importer_spec.rb

@@ -132,6 +132,23 @@ describe Gitlab::BareRepositoryImport::Importer, repository: true do
 
       expect(File).to exist(File.join(project.repository_storage_path, project.disk_path + '.git'))
     end
+
+    it 'moves an existing project to the correct path' do
+      # This is a quick way to get a valid repository instead of copying an
+      # existing one. Since it's not persisted, the importer will try to
+      # create the project.
+      project = build(:project, :repository)
+      original_commit_count = project.repository.commit_count
+
+      bare_repo = Gitlab::BareRepositoryImport::Repository.new(project.repository_storage_path, project.repository.path)
+      gitlab_importer = described_class.new(admin, bare_repo)
+
+      expect(gitlab_importer).to receive(:create_project).and_call_original
+
+      new_project = gitlab_importer.create_project_if_needed
+
+      expect(new_project.repository.commit_count).to eq(original_commit_count)
+    end
   end
 
   context 'with Wiki' do

spec/lib/gitlab/bare_repository_import/repository_spec.rb

@@ -46,6 +46,13 @@ describe ::Gitlab::BareRepositoryImport::Repository do
   describe '#project_full_path' do
     it 'returns the project full path' do
       expect(project_repo_path.repo_path).to eq('/full/path/to/repo.git')
+      expect(project_repo_path.project_full_path).to eq('to/repo')
+    end
+
+    it 'with no trailing slash in the root path' do
+      repo_path = described_class.new('/full/path', '/full/path/to/repo.git')
+
+      expect(repo_path.project_full_path).to eq('to/repo')
     end
   end
 end