Merge pull request #4856 from tyrasd/patch-2

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 0181c5c6866424d9ec5fde7b774364bfe2d912c4..77a9f1c97ff252c30ce1cd4f66dbd1034c1307ec 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -63,6 +63,7 @@ gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"
 gem "rails-i18n", "~> 7.0.0"
+gem "rails_param"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"
@@ -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"