Merge remote-tracking branch 'upstream/pull/3229'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 2802fe3ad9e192da777684ca18ffe5856b1a3383..10e34638eb8d294706f9d7cf8ca543418ec28380 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -117,7 +117,7 @@ gem "browser"
 gem "aws-sdk-s3"
 
 # Used to resize user images
-gem "mini_magick"
+gem "image_processing"
 
 # Gems useful for development
 group :development do
@@ -136,7 +136,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 5.0"
+  gem "puma", "~> 5.3"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"