porting upstream changes

c614089d · Micaël Bergeron · 07eb2f12 · c614089d
Commit c614089d authored Feb 01, 2018 by Micaël Bergeron
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/uploaders/gitlab_uploader.rb app/uploaders/gitlab_uploader.rb +2 -2

No files found.
--- 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?