Merge branch 'main' into dependabot/bundler/web-console-4.2.1

Gemfile

@@ -44,7 +44,7 @@ gem 'bootsnap', '~> 1.13', require: false
 gem 'bootstrap-multiselect-rails', '~> 0.9.9'
 gem 'chartkick'
 gem 'coderay', '~> 1.0'
-gem 'country_select', '~> 8.0'
+gem 'country_select', '~> 10.0'
 gem 'draper', '~> 4.0'
 gem 'faker'
 gem 'fastly'
@@ -54,7 +54,7 @@ gem 'pundit'
 gem 'redcarpet', '~> 3.5'
 gem 'simple_form'
 gem 'tinymce-rails'
-gem 'image_processing', '~> 1.2'
+gem 'image_processing', '~> 1.13'
 gem 'react-rails'
 gem 'webpacker'
 

Gemfile.lock

@@ -91,21 +91,21 @@ GEM
       rake (>= 10.4, < 14.0)
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.710.0)
-    aws-sdk-core (3.170.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.1013.0)
+    aws-sdk-core (3.213.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.62.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.119.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.96.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.173.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
@@ -142,10 +142,10 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.3.4)
     connection_pool (2.3.0)
-    countries (5.3.1)
+    countries (7.0.0)
       unaccent (~> 0.3)
-    country_select (8.0.1)
-      countries (~> 5.0)
+    country_select (10.0.0)
+      countries (> 5.0, < 8.0)
     crass (1.0.6)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
@@ -194,9 +194,9 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    fastly (4.1.0)
+    fastly (8.10.0)
       typhoeus (~> 1.0, >= 1.0.1)
-    ffi (1.15.5)
+    ffi (1.17.0)
     foreman (0.87.2)
     formatador (1.1.0)
     globalid (1.1.0)
@@ -242,7 +242,7 @@ GEM
     http_parser.rb (0.8.0)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
+    image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     interception (0.5)
@@ -284,7 +284,7 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.2)
     mini_portile2 (2.8.8)
     minitest (5.25.2)
@@ -445,8 +445,9 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
+      logger
     ruby2_keywords (0.0.5)
     ruby_http_client (3.5.5)
     ruby_parser (3.19.2)
@@ -501,7 +502,7 @@ GEM
     timeout (0.3.1)
     tinymce-rails (6.3.1)
       railties (>= 3.1.1)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -547,7 +548,7 @@ DEPENDENCIES
   capybara (~> 3.37)
   chartkick
   coderay (~> 1.0)
-  country_select (~> 8.0)
+  country_select (~> 10.0)
   database_cleaner (~> 2.0)
   devise (~> 4.8)
   diffy
@@ -566,7 +567,7 @@ DEPENDENCIES
   haml-rails
   honeybadger (~> 5.20)
   html2haml (~> 2.2)
-  image_processing (~> 1.2)
+  image_processing (~> 1.13)
   jbuilder
   jquery-datatables-rails
   jquery-rails