From 88a0824944720b6edaaef56376713541b9a02118 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 4 Feb 2020 12:09:00 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/uploaders/file_uploader.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/uploaders') diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb index b326b266017..0fc71d2e3f3 100644 --- a/app/uploaders/file_uploader.rb +++ b/app/uploaders/file_uploader.rb @@ -36,7 +36,7 @@ class FileUploader < GitlabUploader def self.base_dir(model, store = Store::LOCAL) decorated_model = model - decorated_model = Storage::HashedProject.new(model) if store == Store::REMOTE + decorated_model = Storage::Hashed.new(model) if store == Store::REMOTE model_path_segment(decorated_model) end @@ -57,7 +57,7 @@ class FileUploader < GitlabUploader # Returns a String without a trailing slash def self.model_path_segment(model) case model - when Storage::HashedProject then model.disk_path + when Storage::Hashed then model.disk_path else model.hashed_storage?(:attachments) ? model.disk_path : model.full_path end -- cgit v1.2.3