diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-10 15:30:44 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-10 15:30:44 +0300 |
| commit | 8eadfd2df76802b02b4d47792acadd5276ca2e2c (patch) | |
| tree | 7ad43a1a5cd3bde40794ce19f2449a06ea5f4271 /lib | |
| parent | 671398e7392c86cf3cbf76037abbc39a40ec5b6d (diff) | |
| parent | a7047569db3e04c29ea5cb24e9be2ac515855b90 (diff) | |
Merge branch 'master' into 'master'
update fog to 1.25.0 and add multipart upload support
This merge will fix backup uploading problems to s3, closing gitlab-org/gitlab-ce#1059
See merge request !789
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/backup/manager.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index b69aebf9fe1..6fa2079d1a8 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -46,7 +46,8 @@ module Backup connection = ::Fog::Storage.new(connection_settings) directory = connection.directories.get(remote_directory) - if directory.files.create(key: tar_file, body: File.open(tar_file), public: false) + if directory.files.create(key: tar_file, body: File.open(tar_file), public: false, + multipart_chunk_size: Gitlab.config.backup.upload.multipart_chunk_size) $progress.puts "done".green else puts "uploading backup to #{remote_directory} failed".red |