diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-01 14:24:59 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-01 15:08:35 -0500 |
| commit | a5bb17ffd5d466568c3bcea161bac42123bd3c1e (patch) | |
| tree | 23642cabdcb5edfc92e8030274d5fbb08e7c612f /app/uploaders | |
| parent | c614089d659398133fcdc1e17a74c9ed7a63a34b (diff) | |
| download | gitlab-ce-a5bb17ffd5d466568c3bcea161bac42123bd3c1e.tar.gz | |
porting changes from upstream3867-port-to-ce
Diffstat (limited to 'app/uploaders')
| -rw-r--r-- | app/uploaders/gitlab_uploader.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb index 3025a0b4ef6..b12829efe73 100644 --- a/app/uploaders/gitlab_uploader.rb +++ b/app/uploaders/gitlab_uploader.rb @@ -35,12 +35,12 @@ class GitlabUploader < CarrierWave::Uploader::Base # Reduce disk IO def move_to_cache - super.nil? ? true : super + file_storage? end # Reduce disk IO def move_to_store - super.nil? ? true : super + file_storage? end def exists? |