diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-11-23 20:04:36 +0300 |
|---|---|---|
| committer | Tiago <tiagonbotelho@hotmail.com> | 2017-11-28 15:27:55 +0300 |
| commit | 1c21cb2bcc95e5a8015f5a3b3b824ed223a2d84a (patch) | |
| tree | 1be3dee038e5d1c3d2ff6904091ddc3ff3324255 /lib | |
| parent | 83fa6cb897738accece5dc6c4558fa1f3b07e914 (diff) | |
Merge branch 'fix/import-uploads-hashed-storage' into 'master'
Fix hashed storage for attachments bugs
Closes #40280
See merge request gitlab-org/gitlab-ce!15482
(cherry picked from commit 1da5df70a99cb2f129ba56ae6eb3836dca56e136)
d3c781f7 add upload saver spec
313bf9cd refactor spec
21357deb fix hashed storage and updated spec
d3b0fbb3 add uploads restorer spec
dce5909a fix typo
ef08a96e add changelog
319dec77 refactor specs
30943bd9 fix spec
be945c38 fix spec
0ed17fdc use dynamic_path_segment for path
22219e89 refactor spec
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/uploads_saver.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/uploads_saver.rb b/lib/gitlab/import_export/uploads_saver.rb index f9ae5079d7c..627a487d577 100644 --- a/lib/gitlab/import_export/uploads_saver.rb +++ b/lib/gitlab/import_export/uploads_saver.rb @@ -24,8 +24,7 @@ module Gitlab end def uploads_path - # TODO: decide what to do with uploads. We will use UUIDs here too? - File.join(Rails.root.join('public/uploads'), @project.path_with_namespace) + FileUploader.dynamic_path_segment(@project) end end end |