diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-19 16:30:42 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-09-19 14:40:52 -0400 |
| commit | c26e1709e70f939671ceaa899d910a10016ebac1 (patch) | |
| tree | f247893d6bf94fdd02d0709b70b31567f134a6f3 | |
| parent | c60ee462bd4be37dfb79afb821d94bfa0aafc964 (diff) | |
| download | gitlab-ce-c26e1709e70f939671ceaa899d910a10016ebac1.tar.gz | |
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
| -rw-r--r-- | app/controllers/projects/uploads_controller.rb | 2 | ||||
| -rw-r--r-- | app/uploaders/avatar_uploader.rb | 2 | ||||
| -rw-r--r-- | app/uploaders/gitlab_uploader.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/do-not-perform-disk-check.yml | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb index 6966a7c5fee..4d2fb17a19b 100644 --- a/app/controllers/projects/uploads_controller.rb +++ b/app/controllers/projects/uploads_controller.rb @@ -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 diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index 66d3bcb998a..cbb79376d5f 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -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 diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb index 05a2091633a..7f72b3ce471 100644 --- a/app/uploaders/gitlab_uploader.rb +++ b/app/uploaders/gitlab_uploader.rb @@ -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 diff --git a/changelogs/unreleased/do-not-perform-disk-check.yml b/changelogs/unreleased/do-not-perform-disk-check.yml new file mode 100644 index 00000000000..cc139ee2c9e --- /dev/null +++ b/changelogs/unreleased/do-not-perform-disk-check.yml @@ -0,0 +1,5 @@ +--- +title: File uploaders do not perform hard check, only soft check +merge_request: +author: +type: fixed |