diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-30 18:08:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-30 18:08:37 +0000 |
| commit | d6e956d3a89fbb7f1a503f152fe9a4e2ca931d85 (patch) | |
| tree | bcfe6c26b31fe352691c31bd6966d1f24c1fc247 /app/models/project.rb | |
| parent | e68a1fc1be858643299f8a753e8fa80dc901ef77 (diff) | |
| parent | c6371ae929d9a733c658de6d3e22ff60a1e7e8e4 (diff) | |
| download | gitlab-ce-d6e956d3a89fbb7f1a503f152fe9a4e2ca931d85.tar.gz | |
Merge branch '36807-gc-unwanted-refs-after-import' into 'master'
Remove unwanted refs after importing a project
Closes #36807
See merge request !13766
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index d5324ceac31..9d7bea4eb66 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -372,11 +372,7 @@ class Project < ActiveRecord::Base if Gitlab::ImportSources.importer_names.include?(project.import_type) && project.repo_exists? project.run_after_commit do - begin - Projects::HousekeepingService.new(project).execute - rescue Projects::HousekeepingService::LeaseTaken => e - Rails.logger.info("Could not perform housekeeping for project #{project.full_path} (#{project.id}): #{e}") - end + Projects::AfterImportService.new(project).execute end end end |