Merge pull request #8423 from SuperTux88:update-carrierwave-ruby-3

Update carrierwave and add ruby 3.0 support

.github/workflows/ci.yml

@@ -15,7 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.7
+          - '2.7'
+          - '3.0'
         db:
           - mysql
           - postgresql

.ruby-version

@@ -1 +1 @@
-2.7
+3.0

Changelog.md

@@ -34,6 +34,10 @@ With this release, we switched from `unicorn` to `puma` to run our applications.
 
 We use yarn to install the frontend dependencies now, so you need to have that installed. See here for how to install it: https://yarnpkg.com/en/docs/install
 
+## Suggested Ruby version: 3.0
+
+We recommend setting up new pods using Ruby 3.0, and updating existing pods to this version as well.
+
 ## Refactor
 * Add bootstrapping for using ECMAScript 6 with automatic transpiling for compatibility [#7581](https://github.com/diaspora/diaspora/pull/7581) [#8397](https://github.com/diaspora/diaspora/pull/8397)
 * Remove backporting of mention syntax [#7788](https://github.com/diaspora/diaspora/pull/7788)
@@ -49,6 +53,7 @@ We use yarn to install the frontend dependencies now, so you need to have that i
 * Drop `strip_exif` flag and always remove exif data from uploaded images [#8417](https://github.com/diaspora/diaspora/pull/8417)
 * Replace `apparition` with `cuprite` [#8418](https://github.com/diaspora/diaspora/pull/8418)
 * Remove `i18n-inflector-rails` for translations [#8420](https://github.com/diaspora/diaspora/pull/8420)
+* Update carrierwave and add ruby 3.0 support [#8423](https://github.com/diaspora/diaspora/pull/8423)
 
 ## Bug fixes
 * Fix multiple photos upload progress bar [#7655](https://github.com/diaspora/diaspora/pull/7655)

Gemfile

@@ -78,7 +78,7 @@ gem "activerecord-import", "1.4.0"
 
 # File uploading
 
-gem "carrierwave", "2.2.2"
+gem "carrierwave", "2.2.4"
 gem "fog-aws",     "3.14.0"
 gem "mini_magick", "4.11.0"
 

Gemfile.lock

@@ -106,7 +106,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.2)
+    carrierwave (2.2.4)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -140,7 +140,7 @@ GEM
     chunky_png (1.4.0)
     citrus (3.0.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     configurate (0.5.0)
     connection_pool (2.2.5)
     crack (0.4.5)
@@ -360,7 +360,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     idn-ruby (0.1.0)
     image_processing (1.12.2)
@@ -579,7 +579,7 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (12.3.3)
+    rake (13.0.6)
     rash_alt (0.4.12)
       hashie (>= 3.4)
     rb-fsevent (0.11.1)
@@ -639,7 +639,11 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rugged (1.0.1)
-    sass (3.4.25)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -651,9 +655,8 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    scss_lint (0.55.0)
+    scss_lint (0.60.0)
-      rake (>= 0.9, < 13)
+      sass (~> 3.5, >= 3.5.5)
-      sass (~> 3.4.20)
     secure_headers (6.3.3)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
@@ -682,7 +685,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    ssrf_filter (1.0.7)
+    ssrf_filter (1.1.1)
     state_machines (0.5.0)
     string-direction (1.2.2)
     swd (1.3.0)
@@ -722,7 +725,7 @@ GEM
       unf (~> 0.1.0)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
@@ -761,7 +764,7 @@ GEM
     yajl-ruby (1.4.3)
     yard (0.9.28)
       webrick (~> 1.7.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -778,7 +781,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.3)
   capybara (= 3.35.3)
-  carrierwave (= 2.2.2)
+  carrierwave (= 2.2.4)
   chrome_remote (= 0.3.0)
   configurate (= 0.5.0)
   cucumber-api-steps (= 0.14)

docker/develop/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/amd64/ruby:2.7-slim-bullseye
+FROM docker.io/amd64/ruby:3.0-slim-bullseye
 
 RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update && \