From 3c10dbc5474e2d55fac8eac527398e6df61c6948 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 10 Jun 2023 19:09:29 +0200
Subject: [PATCH 1/3] Bump carrierwave

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8d30d3f4f..19e4592f4 100644
--- a/Gemfile
+++ b/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"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bb7eb5083..2795119ef 100644
--- a/Gemfile.lock
+++ b/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)
@@ -682,7 +682,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 +722,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 +761,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 +778,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)

From d790e3dcba0f840da2c388de5e0961f3e5b2ed6e Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 10 Jun 2023 19:55:35 +0200
Subject: [PATCH 2/3] Bump scss_lint and rake

Old rake version didn't work with ruby 3.0 in docker
---
 Gemfile.lock | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2795119ef..d0fa1c499 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
-      rake (>= 0.9, < 13)
-      sass (~> 3.4.20)
+    scss_lint (0.60.0)
+      sass (~> 3.5, >= 3.5.5)
     secure_headers (6.3.3)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)

From ae813f0cf260f16aa704f51203340303a97f53a1 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 10 Jun 2023 19:37:19 +0200
Subject: [PATCH 3/3] Enable ruby 3.0 on CI and switch default to 3.0

---
 .github/workflows/ci.yml  | 3 ++-
 .ruby-version             | 2 +-
 docker/develop/Dockerfile | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3398ef641..475e2d957 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.7
+          - '2.7'
+          - '3.0'
         db:
           - mysql
           - postgresql
diff --git a/.ruby-version b/.ruby-version
index 1effb0034..9f55b2ccb 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7
+3.0
diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
index 44182f765..6a0e93cda 100644
--- a/docker/develop/Dockerfile
+++ b/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 && \