diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-31 14:34:53 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-07-31 14:34:53 +0200 |
| commit | 51e5f379dd69837d3405c78e5ef6ce3727939f3c (patch) | |
| tree | ec0404f8af61a712c25fb43a4bf21e2ff0349098 /lib/backup/uploads.rb | |
| parent | 1c7a8b8c27398250983bf4329007f6971df65f34 (diff) | |
| parent | a51a3fb8ed92a58b375125b19f75c3d4c545571a (diff) | |
| download | gitlab-ce-51e5f379dd69837d3405c78e5ef6ce3727939f3c.tar.gz | |
Merge branch 'master' into api-useremails
Diffstat (limited to 'lib/backup/uploads.rb')
| -rw-r--r-- | lib/backup/uploads.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/backup/uploads.rb b/lib/backup/uploads.rb index bf43610acf6..1f9626644e6 100644 --- a/lib/backup/uploads.rb +++ b/lib/backup/uploads.rb @@ -10,7 +10,11 @@ module Backup # Copy uploads from public/uploads to backup/uploads def dump - FileUtils.mkdir_p(backup_uploads_dir) + FileUtils.rm_rf(backup_uploads_dir) + # Ensure the parent dir of backup_uploads_dir exists + FileUtils.mkdir_p(Gitlab.config.backup.path) + # Fail if somebody raced to create backup_uploads_dir before us + FileUtils.mkdir(backup_uploads_dir, mode: 0700) FileUtils.cp_r(app_uploads_dir, backup_dir) end |