summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-06-08 07:23:52 +0200
committerBob Van Landuyt <bob@gitlab.com>2017-06-08 16:17:13 +0200
commit2e97db887cf5acf28143a04badc3cbf77b54ea44 (patch)
tree7f26427c759ac72a2eb6c5c0f50304882f6b25c4 /app/uploaders
parent565ead610215d32fc6fe57a78f595fad51588e49 (diff)
downloadgitlab-ce-2e97db887cf5acf28143a04badc3cbf77b54ea44.tar.gz
Make the uploader use the updated folder
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/gitlab_uploader.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb
index 489613030e6..e4e6d6f46b1 100644
--- a/app/uploaders/gitlab_uploader.rb
+++ b/app/uploaders/gitlab_uploader.rb
@@ -15,10 +15,12 @@ class GitlabUploader < CarrierWave::Uploader::Base
# This method is overridden in the `FileUploader`
def self.base_dir
return root_dir unless file_storage?
+
+ File.join(root_dir, 'system')
end
def self.file_storage?
- self.storage.is_a?(CarrierWave::Storage::File)
+ self.storage == CarrierWave::Storage::File
end
delegate :base_dir, :file_storage?, to: :class