Merge branch 'master' into feature/add-communities-page

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index a0dce8dbcf1505e3b0f638fd4251136f641d744d..7bad308b49bef847fa3c65b2e8a6bc17e1b2de1e 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.3"
+gem "rails", "7.0.4"

 
 # 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"


@@ -73,7 +77,7 @@ gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2
 gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2

-gem "doorkeeper"
+gem "doorkeeper", "~> 5.5.4"

 gem "doorkeeper-i18n"
 
 # Markdown formatting support
 gem "doorkeeper-i18n"
 
 # Markdown formatting support