diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-06 17:42:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-06 17:42:30 +0000 |
| commit | 8526c9f3c4fc29f544593bcc361409eaf80caafe (patch) | |
| tree | 68936213d8a8f4cb6af05348e9fb305757c2010c /lib/backup | |
| parent | 1ad1cdba9693cbdbe96ea3d83789f06b9898c6d3 (diff) | |
| parent | 7a7ec1ac0f742753d7acfacb7b7913ebbaf81558 (diff) | |
| download | gitlab-ce-8526c9f3c4fc29f544593bcc361409eaf80caafe.tar.gz | |
Merge branch 'backup_storage_class' into 'master'
Add storage class configuration option for Amazon S3 remote backups
See merge request !9599
Diffstat (limited to 'lib/backup')
| -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 5cc164a6325..7b4476fa4db 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -51,7 +51,8 @@ module Backup if directory.files.create(key: tar_file, body: File.open(tar_file), public: false, multipart_chunk_size: Gitlab.config.backup.upload.multipart_chunk_size, - encryption: Gitlab.config.backup.upload.encryption) + encryption: Gitlab.config.backup.upload.encryption, + storage_class: Gitlab.config.backup.upload.storage_class) $progress.puts "done".color(:green) else puts "uploading backup to #{remote_directory} failed".color(:red) |