Commit f13158a0 authored by Stan Hu's avatar Stan Hu

Merge branch 'do-not-perform-disk-check' into 'master'

Do not perform hard check (presence of file on storage)

Closes #37945

See merge request gitlab-org/gitlab-ce!14369
parents 02b398d3 263717d7
......@@ -28,7 +28,7 @@ class Projects::UploadsController < Projects::ApplicationController
end
def image_or_video?
uploader && uploader.file.exists? && uploader.image_or_video?
uploader && uploader.exists? && uploader.image_or_video?
end
def uploader_class
......
......@@ -9,7 +9,7 @@ class AvatarUploader < GitlabUploader
end
def exists?
model.avatar.file && model.avatar.file.exists?
model.avatar.file && model.avatar.file.present?
end
# We set move_to_store and move_to_cache to 'false' to prevent stealing
......
......@@ -51,7 +51,7 @@ class GitlabUploader < CarrierWave::Uploader::Base
end
def exists?
file.try(:exists?)
file.present?
end
# Override this if you don't want to save files by default to the Rails.root directory
......
---
title: File uploaders do not perform hard check, only soft check
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment