From 0d0bbdc40a4bc85270c4714fad15e4863ad36046 Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Mon, 16 Jan 2023 11:38:44 +0000
Subject: [PATCH] fixup! Add support for Ruby 3.1

---
 Gemfile           |  2 +-
 Gemfile_next.lock | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index b2418759471..35008fcdf18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -153,7 +153,7 @@ gem 'mime-types', '< 3.0.0', require: false
 # Assets
 gem 'bootstrap-sass', '~> 2.3.2.2'
 gem 'mini_racer', '~> 0.6.3'
-gem 'sass-rails', '~> 5.0.8'
+gem 'sass-rails', dependencies_next? ? '~> 6.0.0' : '~> 5.0.8'
 gem 'uglifier', '~> 4.2.0'
 
 # Feature flags
diff --git a/Gemfile_next.lock b/Gemfile_next.lock
index 497bb394d78..e11a13ee8c0 100644
--- a/Gemfile_next.lock
+++ b/Gemfile_next.lock
@@ -458,13 +458,21 @@ GEM
     ruby-ole (1.2.12.1)
     ruby-progressbar (1.11.0)
     rubyzip (2.3.2)
-    sass (3.4.25)
-    sass-rails (5.0.8)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    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)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     secure_headers (6.4.0)
     signet (0.17.0)
       addressable (~> 2.8)
@@ -478,9 +486,9 @@ GEM
     simplecov-html (0.10.2)
     simplecov-lcov (0.7.0)
     singleton (0.1.1)
-    sprockets (3.7.2)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -495,7 +503,7 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (1.2.1)
-    tilt (2.0.10)
+    tilt (2.0.11)
     timeout (0.3.1)
     trailblazer-option (0.1.2)
     tzinfo (2.0.5)
@@ -604,7 +612,7 @@ DEPENDENCIES
   rubocop-rails
   ruby-msg (~> 1.5.0)!
   rubyzip (~> 2.3.2)
-  sass-rails (~> 5.0.8)
+  sass-rails (~> 6.0.0)
   secure_headers (~> 6.4.0)
   simplecov (~> 0.17.1)
   simplecov-lcov (~> 0.7.0)