From dc3bef6a934e4cb7fc701b4033e0a9ef335c8e33 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 27 Jun 2021 23:38:42 +0200
Subject: [PATCH] Bump carrierwave
---
Gemfile | 2 +-
Gemfile.lock | 18 +++++++++++++-----
app/uploaders/exported_user.rb | 2 +-
app/uploaders/processed_image.rb | 2 +-
app/uploaders/unprocessed_image.rb | 2 +-
config/initializers/carrierwave.rb | 2 +-
6 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Gemfile b/Gemfile
index aeff8fbc20..24588ab7db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,7 @@ gem "activerecord-import", "1.1.0"
# File uploading
-gem "carrierwave", "1.3.2"
+gem "carrierwave", "2.2.2"
gem "fog-aws", "3.5.2"
gem "mini_magick", "4.10.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ad480a5a0..9e4b404487 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,10 +89,13 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
- carrierwave (1.3.2)
- activemodel (>= 4.0.0)
- activesupport (>= 4.0.0)
- mime-types (>= 1.16)
+ carrierwave (2.2.2)
+ activemodel (>= 5.0.0)
+ activesupport (>= 5.0.0)
+ addressable (~> 2.6)
+ image_processing (~> 1.1)
+ marcel (~> 1.0.0)
+ mini_mime (>= 0.1.3)
ssrf_filter (~> 1.0)
celluloid (0.17.4)
celluloid-essentials
@@ -340,6 +343,9 @@ GEM
actionpack (>= 3.0.0)
i18n-inflector (~> 2.6)
railties (>= 3.0.0)
+ image_processing (1.12.1)
+ mini_magick (>= 4.9.5, < 5)
+ ruby-vips (>= 2.0.17, < 3)
ipaddress (0.8.3)
jasmine (3.7.0)
jasmine-core (~> 3.7.0)
@@ -658,6 +664,8 @@ GEM
rubocop (>= 0.90.0, < 2.0)
ruby-oembed (0.12.0)
ruby-progressbar (1.11.0)
+ ruby-vips (2.1.2)
+ ffi (~> 1.12)
rubyzip (2.3.0)
rugged (1.0.1)
sass (3.4.25)
@@ -799,7 +807,7 @@ DEPENDENCIES
bootstrap-sass (= 3.4.1)
bootstrap-switch-rails (= 3.3.3)
capybara (= 3.35.3)
- carrierwave (= 1.3.2)
+ carrierwave (= 2.2.2)
chrome_remote (= 0.3.0)
compass-rails (= 3.1.0)
configurate (= 0.5.0)
diff --git a/app/uploaders/exported_user.rb b/app/uploaders/exported_user.rb
index 53201d9186..3fc0172e6b 100644
--- a/app/uploaders/exported_user.rb
+++ b/app/uploaders/exported_user.rb
@@ -9,7 +9,7 @@ class ExportedUser < SecureUploader
"uploads/users"
end
- def extension_whitelist
+ def extension_allowlist
%w[gz]
end
diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 9d614f466f..79b61b9c7a 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -11,7 +11,7 @@ class ProcessedImage < CarrierWave::Uploader::Base
"uploads/images"
end
- def extension_whitelist
+ def extension_allowlist
%w[jpg jpeg png gif]
end
diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb
index b662f3b408..6dad5f602b 100644
--- a/app/uploaders/unprocessed_image.rb
+++ b/app/uploaders/unprocessed_image.rb
@@ -17,7 +17,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base
"uploads/images"
end
- def extension_whitelist
+ def extension_allowlist
%w[jpg jpeg png gif]
end
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 3b0119590d..4a212ad111 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -8,9 +8,9 @@
ENV['SSL_CERT_FILE'] = AppConfig.environment.certificate_authorities.get
CarrierWave.configure do |config|
if !Rails.env.test? && AppConfig.environment.s3.enable?
- config.fog_provider = "fog/aws"
require "carrierwave/storage/fog"
config.storage = :fog
+ config.cache_storage = :file
config.cache_dir = Rails.root.join('tmp', 'uploads').to_s
config.fog_credentials = {
provider: 'AWS',
--
GitLab