From fc9832b1e67f9798a337a8ad3e1284409360e123 Mon Sep 17 00:00:00 2001
From: Bryan Stearns <bryanstearns@gmail.com>
Date: Sun, 3 Aug 2014 13:10:19 -0700
Subject: [PATCH] Avoid "cannot copy directory to itself" restore error
---
lib/backup/uploads.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/backup/uploads.rb b/lib/backup/uploads.rb
index e50e1ff4f13..bf43610acf6 100644
--- a/lib/backup/uploads.rb
+++ b/lib/backup/uploads.rb
@@ -23,7 +23,7 @@ module Backup
def backup_existing_uploads_dir
timestamped_uploads_path = File.join(app_uploads_dir, '..', "uploads.#{Time.now.to_i}")
if File.exists?(app_uploads_dir)
- FileUtils.mv(app_uploads_dir, timestamped_uploads_path)
+ FileUtils.mv(app_uploads_dir, File.expand_path(timestamped_uploads_path))
end
end
end
--
GitLab