summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-08-30 21:15:06 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-08-30 22:01:23 +0800
commitc5553ce772371295d2d7652cec899633042fae07 (patch)
treeeb8f9a5ede93f7edaa8dd1eeb8960b95f9697dd0 /app
parent86149a82168e9aead7ce6841c69705662f8a6e54 (diff)
downloadgitlab-ce-c5553ce772371295d2d7652cec899633042fae07.tar.gz
Use `git update-ref --stdin -z` to delete refs36807-gc-unwanted-refs-after-import
Diffstat (limited to 'app')
-rw-r--r--app/models/repository.rb2
-rw-r--r--app/services/projects/after_import_service.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 5758aacd57f..d29d2a83708 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1246,6 +1246,6 @@ class Repository
yield commit(sha)
ensure
- rugged.references.delete(tmp_ref) if tmp_ref
+ delete_refs(tmp_ref) if tmp_ref
end
end
diff --git a/app/services/projects/after_import_service.rb b/app/services/projects/after_import_service.rb
index 107856885f3..e6a68d983ef 100644
--- a/app/services/projects/after_import_service.rb
+++ b/app/services/projects/after_import_service.rb
@@ -9,7 +9,7 @@ module Projects
def execute
Projects::HousekeepingService.new(@project).execute do
- repository.delete_refs(garbage_refs)
+ repository.delete_refs(*garbage_refs)
end
rescue Projects::HousekeepingService::LeaseTaken => e
Rails.logger.info(