From 42567436863c96b7f184cc7a728b2da3d18852c8 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 22 Apr 2016 12:18:11 +0200
Subject: [PATCH] refactored path stuff
---
lib/gitlab/import_export.rb | 4 +---
lib/gitlab/import_export/saver.rb | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb
index fe88850c33d..539eae13f33 100644
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -3,7 +3,7 @@ module Gitlab
extend self
def export_path(relative_path:)
- File.join(storage_path, relative_path, "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_gitlab_export")
+ File.join(storage_path, relative_path)
end
def project_atts
@@ -14,8 +14,6 @@ module Gitlab
Gitlab::ImportExport::ImportExportReader.project_tree
end
- private
-
def storage_path
File.join(Settings.shared['path'], 'tmp/project_exports')
end
diff --git a/lib/gitlab/import_export/saver.rb b/lib/gitlab/import_export/saver.rb
index f26804d2402..f87e0fdc7ea 100644
--- a/lib/gitlab/import_export/saver.rb
+++ b/lib/gitlab/import_export/saver.rb
@@ -31,7 +31,7 @@ module Gitlab
end
def archive_file
- @archive_file ||= File.join(@storage_path, '..', 'project.tar.gz')
+ @archive_file ||= File.join(@storage_path, '..', "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_project_export.tar.gz")
end
end
end
--
GitLab