summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export.rb
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-08-02 11:32:28 +0200
committerJames Lopez <james@jameslopez.es>2016-08-04 12:51:55 +0200
commit6a0bbb5aa58e37a0ad8c3817c4e809143adce1be (patch)
tree7ea74aad1858746674f1fa345cc5f40d32117b78 /lib/gitlab/import_export.rb
parent632113e43cc3296759b11dc20b1b7f2f056278f0 (diff)
downloadgitlab-ce-6a0bbb5aa58e37a0ad8c3817c4e809143adce1be.tar.gz
using shared path for project import uploads and refactored gitlab remove export worker
Diffstat (limited to 'lib/gitlab/import_export.rb')
-rw-r--r--lib/gitlab/import_export.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb
index 48b2c43ac21..bb562bdcd2c 100644
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -13,6 +13,10 @@ module Gitlab
File.join(Settings.shared['path'], 'tmp/project_exports')
end
+ def import_upload_path(filename:)
+ File.join(storage_path, 'uploads', filename)
+ end
+
def project_filename
"project.json"
end