Commit 1c9a4035 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'georgekoltsov/dont-schedule-project-import-for-gitlab-migration' into 'master'

Do not schedule project import when migrating using GitLab Migration

See merge request gitlab-org/gitlab!84055
parents 3112fdb6 2de2fa05
......@@ -243,7 +243,7 @@ module Projects
def import_schedule
if @project.errors.empty?
@project.import_state.schedule if @project.import? && !@project.bare_repository_import?
@project.import_state.schedule if @project.import? && !@project.bare_repository_import? && !@project.gitlab_project_migration?
else
fail(error: @project.errors.full_messages.join(', '))
end
......
......@@ -376,6 +376,18 @@ RSpec.describe Projects::CreateService, '#execute' do
imported_project
end
describe 'import scheduling' do
context 'when project import type is gitlab project migration' do
it 'does not schedule project import' do
opts[:import_type] = 'gitlab_project_migration'
project = create_project(user, opts)
expect(project.import_state.status).to eq('none')
end
end
end
end
context 'builds_enabled global setting' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment