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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 253b685a7bd8964a1122bc40578e13e9f7522bec..77a9f1c97ff252c30ce1cd4f66dbd1034c1307ec 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ gem "jbuilder", "~> 2.7"
 gem "bootsnap", ">= 1.4.2", :require => false
 
 # Use rtlcss for RTL conversion
+gem "mini_racer", "~> 0.9.0"
 gem "rtlcss"
 
 # Use autoprefixer to generate CSS prefixes
@@ -115,9 +116,6 @@ gem "connection_pool"
 gem "dalli"
 gem "kgio"
 
-# Load secure_headers for Content-Security-Policy support
-gem "secure_headers"
-
 # Load canonical-rails to generate canonical URLs
 gem "canonical-rails"
 
@@ -131,7 +129,7 @@ gem "gd2-ffij", ">= 0.4.0"
 gem "marcel"
 
 # Used for browser detection
-gem "browser"
+gem "browser", "< 6" # for ruby 3.0 support
 
 # Used for S3 object storage
 gem "aws-sdk-s3"
@@ -142,6 +140,9 @@ gem "image_processing"
 # Used to validate widths
 gem "unicode-display_width"
 
+# Keep ruby 3.0 compatibility
+gem "multi_xml", "~> 0.6.0"
+
 # Gems useful for development
 group :development do
   gem "better_errors"