Merge remote-tracking branch 'upstream/pull/5263'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 27f295eb654f1ff36bd7c248aae85ecd37b08b01..8d010bea76792c62561f7cdd1e2be985c1634c79 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "~> 7.1.0"
+gem "rails", "~> 7.2.0"

 gem "turbo-rails"
 
 # Require json for multi_json
 gem "turbo-rails"
 
 # Require json for multi_json


@@ -130,7 +130,7 @@ gem "gd2-ffij", ">= 0.4.0"
 gem "marcel"
 
 # Used for browser detection
 gem "marcel"
 
 # Used for browser detection

-gem "browser", "< 6" # for ruby 3.0 support
+gem "browser", "< 6" # for ruby 3.1 support

 
 # Used for S3 object storage
 gem "aws-sdk-s3"
 
 # Used for S3 object storage
 gem "aws-sdk-s3"


@@ -141,8 +141,8 @@ gem "image_processing"
 # Used to validate widths
 gem "unicode-display_width"
 
 # Used to validate widths
 gem "unicode-display_width"
 

-# Keep ruby 3.0 compatibility
-gem "multi_xml", "~> 0.6.0"
+# Lock some modules to old versions for ruby 3.1 support
+gem "zeitwerk", "< 2.7"

 
 # Gems useful for development
 group :development do
 
 # Gems useful for development
 group :development do