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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 8782fdfeffd47aef046f2f1db90366ffb6c8012d..f5d0f7f4ff562f0570210ac6f3db6710742cda13 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.0.2.2"
+gem "rails", "~> 7.0.0"

 
 # Require json for multi_json
 gem "json"
 
 # Require json for multi_json
 gem "json"


@@ -36,18 +36,22 @@ gem "image_optim_rails"
 # Use argon2 for password hashing
 gem "argon2"
 
 # Use argon2 for password hashing
 gem "argon2"
 

+# Support brotli compression for assets
+gem "sprockets-exporters_pack"
+

 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"

-gem "bootstrap", "~> 4.5.0"
-gem "bootstrap_form", "~> 4.0"
+gem "bootstrap", "~> 5.1.0"
+gem "bootstrap_form", "~> 5.0"

 gem "cancancan"
 gem "composite_primary_keys", "~> 14.0.0"
 gem "config"
 gem "delayed_job_active_record"
 gem "cancancan"
 gem "composite_primary_keys", "~> 14.0.0"
 gem "config"
 gem "delayed_job_active_record"

+gem "frozen_record"

 gem "http_accept_language", "~> 2.1.1"
 gem "http_accept_language", "~> 2.1.1"

-gem "i18n-js", ">= 3.0.0"
+gem "i18n-js", "~> 3.9.2"

 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"


@@ -127,6 +131,9 @@ gem "aws-sdk-s3"
 # Used to resize user images
 gem "image_processing"
 
 # Used to resize user images
 gem "image_processing"
 

+# Avoid mail 2.8.0 due to https://github.com/mikel/mail/issues/1489
+gem "mail", "~> 2.7.1"
+

 # Gems useful for development
 group :development do
   gem "annotate"
 # Gems useful for development
 group :development do
   gem "annotate"


@@ -144,7 +151,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"

-  gem "puma", "~> 5.3"
+  gem "puma", "~> 5.6"

   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"