diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-02 18:41:40 +0300 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-08 17:25:56 +0300 |
| commit | 2387ef2b4a9944749f0cd1db5c7e7f55f3745780 (patch) | |
| tree | af51290e8b3e26f702bbd320eeb194126470fa44 /app/uploaders/namespace_file_uploader.rb | |
| parent | 960b6337cbaaf6a7dad2232c3722010f305eee82 (diff) | |
Merge branch 'poc-upload-hashing-path' into 'master'
File uploads on objects storage should use hashed storage
Closes #4952
See merge request gitlab-org/gitlab-ee!4597
Diffstat (limited to 'app/uploaders/namespace_file_uploader.rb')
| -rw-r--r-- | app/uploaders/namespace_file_uploader.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/uploaders/namespace_file_uploader.rb b/app/uploaders/namespace_file_uploader.rb index 269415b1926..1085ecb1700 100644 --- a/app/uploaders/namespace_file_uploader.rb +++ b/app/uploaders/namespace_file_uploader.rb @@ -4,7 +4,7 @@ class NamespaceFileUploader < FileUploader options.storage_path end - def self.base_dir(model) + def self.base_dir(model, _store = nil) File.join(options.base_dir, 'namespace', model_path_segment(model)) end @@ -20,7 +20,7 @@ class NamespaceFileUploader < FileUploader def store_dirs { Store::LOCAL => File.join(base_dir, dynamic_segment), - Store::REMOTE => File.join('namespace', model_path_segment, dynamic_segment) + Store::REMOTE => File.join('namespace', self.class.model_path_segment(model), dynamic_segment) } end end |