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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 65ee29d58dac53ea8aa0014f61603180d563f873..cdbd48d04f8da616525af7c2ec2f2fc343ee1b0a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "7.0.3.1"
+gem "rails", "7.0.4"
 
 # Require json for multi_json
 gem "json"
@@ -36,6 +36,9 @@ 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"
@@ -149,7 +152,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
-  gem "rubocop-rails"
+  gem "rubocop-rails", "= 2.16.1"
   gem "rubocop-rake"
   gem "selenium-webdriver"
   gem "simplecov", :require => false