From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Jul 2024 20:06:33 +0000 (+0100)
Subject: Keep to strong_migrations 1.8 for ruby 3.0 compatibility
X-Git-Tag: live~351
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fffaacb49eac749230ab6346c510281d6fe7f45f

Keep to strong_migrations 1.8 for ruby 3.0 compatibility
---

diff --git a/Gemfile b/Gemfile
index 5a21c7f7a..fcf2ceb4d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ gem "rack-cors"
 gem "rails-i18n", "~> 7.0.0"
 gem "rails_param"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
-gem "strong_migrations"
+gem "strong_migrations", "< 2.0.0"
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c4589cce..774d795bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,18 +96,18 @@ GEM
       execjs (~> 2)
     aws-eventstream (1.3.0)
     aws-partitions (1.950.0)
-    aws-sdk-core (3.200.0)
+    aws-sdk-core (3.201.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.87.0)
-      aws-sdk-core (~> 3, >= 3.199.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.155.0)
-      aws-sdk-core (~> 3, >= 3.199.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.5)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
@@ -560,8 +560,8 @@ GEM
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     stringio (3.1.1)
-    strong_migrations (2.0.0)
-      activerecord (>= 6.1)
+    strong_migrations (1.8.0)
+      activerecord (>= 5.2)
     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -693,7 +693,7 @@ DEPENDENCIES
   simplecov
   simplecov-lcov
   sprockets-exporters_pack
-  strong_migrations
+  strong_migrations (< 2.0.0)
   terser
   turbo-rails
   unicode-display_width