diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-05-10 13:33:04 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-05-10 13:33:04 +0000 |
| commit | 4c16ce118498a2e3b98ad069000031fa9c55fcd3 (patch) | |
| tree | 3b210a73fe1842352dcf403e68329810d58b5501 | |
| parent | b575b303434577ab7d409a8c7321c0bce96d0994 (diff) | |
| parent | 36b1a2d7d08e1615f13fe839cc8251ba76ea87c6 (diff) | |
| download | gitlab-ce-4c16ce118498a2e3b98ad069000031fa9c55fcd3.tar.gz | |
Merge branch 'sh-revert-full-gc-after-import' into 'master'
Don't run full gc in AfterImportService
Closes gitlab-ee#11556
See merge request gitlab-org/gitlab-ce!28239
| -rw-r--r-- | app/services/projects/after_import_service.rb | 2 | ||||
| -rw-r--r-- | spec/services/projects/after_import_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/projects/after_import_service.rb b/app/services/projects/after_import_service.rb index afb9048e87b..bbdde4408d2 100644 --- a/app/services/projects/after_import_service.rb +++ b/app/services/projects/after_import_service.rb @@ -9,7 +9,7 @@ module Projects end def execute - Projects::HousekeepingService.new(@project, :gc).execute do + Projects::HousekeepingService.new(@project).execute do repository.delete_all_refs_except(RESERVED_REF_PREFIXES) end rescue Projects::HousekeepingService::LeaseTaken => e diff --git a/spec/services/projects/after_import_service_spec.rb b/spec/services/projects/after_import_service_spec.rb index 95c11f71c5e..51d3fd18881 100644 --- a/spec/services/projects/after_import_service_spec.rb +++ b/spec/services/projects/after_import_service_spec.rb @@ -15,7 +15,7 @@ describe Projects::AfterImportService do describe '#execute' do before do allow(Projects::HousekeepingService) - .to receive(:new).with(project, :gc).and_return(housekeeping_service) + .to receive(:new).with(project).and_return(housekeeping_service) allow(housekeeping_service) .to receive(:execute).and_yield |