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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index c4f8d2537559bf75fd7c37edc65ff7e0aa768aa2..8a5d4432a06425e1f6d0b9ff2d9bf0cf2009a3a8 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "7.0.2.4"
+gem "rails", "~> 7.0.0"
 
 # Require json for multi_json
 gem "json"
@@ -36,18 +36,22 @@ gem "image_optim_rails"
 # 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"
-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 "frozen_record"
 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"
@@ -147,6 +151,7 @@ group :test do
   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"
+  gem "rubocop-capybara"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"