refactored path stuff

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