Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-02-01 20:13:09 +0300
committerMicaël Bergeron <mbergeron@gitlab.com>2018-02-01 20:14:46 +0300
commitc614089d659398133fcdc1e17a74c9ed7a63a34b (patch)
tree7032c2f5b626bf4be29b45d215f74783b183722a /app/uploaders
parent07eb2f1297e3172cc01b3899f0ba799b1e4aafdc (diff)
porting upstream changes
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/gitlab_uploader.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb
index be8ab05b036..3025a0b4ef6 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 || true
+ super.nil? ? true : super
end
# Reduce disk IO
def move_to_store
- super || true
+ super.nil? ? true : super
end
def exists?