diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-07 09:24:21 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-07 09:24:21 +0000 |
commit | 3276e88bd5d372004a599d4e3cbb3dda6b32a777 (patch) | |
tree | 902532d7c8b675c3871ab6918cc26621eadae551 /app/uploaders | |
parent | 2cffa02e395135aa6d0c1dfa98dec1d0bd1b6fe7 (diff) | |
parent | 0a1c805d851c8945baf540736024ebc5d385ce58 (diff) | |
download | gitlab-ce-3276e88bd5d372004a599d4e3cbb3dda6b32a777.tar.gz |
Merge branch 'fix-namespace-uploader' into 'master'
Fix NamespaceUploader.base_dir for remote uploads
See merge request gitlab-org/gitlab-ce!21308
Diffstat (limited to 'app/uploaders')
-rw-r--r-- | app/uploaders/namespace_file_uploader.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/uploaders/namespace_file_uploader.rb b/app/uploaders/namespace_file_uploader.rb index 52969762b7d..b0154f85a5c 100644 --- a/app/uploaders/namespace_file_uploader.rb +++ b/app/uploaders/namespace_file_uploader.rb @@ -6,8 +6,15 @@ class NamespaceFileUploader < FileUploader options.storage_path end - def self.base_dir(model, _store = nil) - File.join(options.base_dir, 'namespace', model_path_segment(model)) + def self.base_dir(model, store = nil) + base_dirs(model)[store || Store::LOCAL] + end + + def self.base_dirs(model) + { + Store::LOCAL => File.join(options.base_dir, 'namespace', model_path_segment(model)), + Store::REMOTE => File.join('namespace', model_path_segment(model)) + } end def self.model_path_segment(model) @@ -18,11 +25,4 @@ class NamespaceFileUploader < FileUploader def store_dir store_dirs[object_store] end - - def store_dirs - { - Store::LOCAL => File.join(base_dir, dynamic_segment), - Store::REMOTE => File.join('namespace', self.class.model_path_segment(model), dynamic_segment) - } - end end |