diff options
author | Rémy Coutable <remy@rymai.me> | 2016-08-04 12:21:53 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-08-04 12:21:53 +0000 |
commit | b2d142c4a026b479925482c4756172d86888198b (patch) | |
tree | b5854516e6ddea3d06279e145548b7ea1c3b6c8d /lib | |
parent | f4c79d6a84defb6ffae7d29a5c9a81fbc413f16c (diff) | |
parent | 9772cd893eba9493037da572df39a3bfb992af59 (diff) | |
download | gitlab-ce-b2d142c4a026b479925482c4756172d86888198b.tar.gz |
Merge branch 'fix/ha-mode-import-issue' into 'master'
Fix Import/Export not working in HA mode
Use a shared path instead of `Tempfile` default `/tmp` so the import file is accessible by any GitLab instance.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20506
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5618
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/import_export.rb | 4 |
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 |