This commit is contained in:
James Lopez 2018-07-11 15:58:42 +02:00
parent fa2e3162f8
commit e2b7880b9d
No known key found for this signature in database
GPG key ID: 756BF8E9D7C0CF39
2 changed files with 16 additions and 8 deletions

View file

@ -29,15 +29,10 @@ module Gitlab
Dir["#{uploads_export_path}/**/*"].each do |upload|
next if File.directory?(upload)
secret, identifier = upload.split('/').last(2)
uploader_context = {
secret: secret,
identifier: identifier
}
UploadService.new(@project, File.open(upload, 'r'), FileUploader, uploader_context).execute
add_upload(upload)
end
true
rescue => e
@shared.error(e)
false
@ -45,6 +40,17 @@ module Gitlab
private
def add_upload(upload)
secret, identifier = upload.split('/').last(2)
uploader_context = {
secret: secret,
identifier: identifier
}
UploadService.new(@project, File.open(upload, 'r'), FileUploader, uploader_context).execute
end
def copy_from_object_storage
return unless Gitlab::ImportExport.object_storage?

View file

@ -9,6 +9,8 @@ module Gitlab
).restore
elsif File.directory?(uploads_export_path)
copy_files(uploads_export_path, uploads_path)
true
else
true
end