diff options
| author | DJ Mountney <david@twkie.net> | 2017-06-08 11:29:36 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-06-08 11:29:36 -0700 |
| commit | e0e5d097327c52e54a6e7433bbf0e350f15bf1f3 (patch) | |
| tree | 6da8e9ff0f5989d9566794292af5cb4eb58d679f /app | |
| parent | 2afd2fbcb83baaeee8c66859c08b4acff812dccf (diff) | |
| parent | 70d7ded5b38376809365cadd7e542254003f8210 (diff) | |
| download | gitlab-ce-e0e5d097327c52e54a6e7433bbf0e350f15bf1f3.tar.gz | |
Merge remote-tracking branch 'origin/upstream-9-2-security' into master-security-updatemaster-security-update
Diffstat (limited to 'app')
| -rw-r--r-- | app/uploaders/gitlab_uploader.rb | 4 |
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 |