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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index a5b7d401f480574b8e30ecf48297e96fa76c5907..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", "6.0.3.6"
+gem "rails", "~> 7.0.0"

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


@@ -12,8 +12,8 @@ gem "pg"
 # Use SCSS for stylesheets
 gem "sassc-rails"
 
 # Use SCSS for stylesheets
 gem "sassc-rails"
 

-# Use Uglifier as compressor for JavaScript assets
-gem "uglifier", ">= 1.3.0"
+# Use Terser as compressor for JavaScript assets
+gem "terser"

 
 # Use jquery as the JavaScript library
 gem "jquery-rails"
 
 # Use jquery as the JavaScript library
 gem "jquery-rails"


@@ -33,22 +33,29 @@ gem "autoprefixer-rails"
 # Use image_optim to optimise images
 gem "image_optim_rails"
 
 # Use image_optim to optimise images
 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"
 # 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 "cancancan"

-gem "composite_primary_keys", "~> 12.0.0"
+gem "composite_primary_keys", "~> 14.0.0"

 gem "config"
 gem "delayed_job_active_record"
 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"

-gem "rails-i18n", "~> 6.0.0"
+gem "rails-i18n", "~> 7.0.0"

 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"


@@ -69,6 +76,10 @@ gem "omniauth-openid"
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 

+# Doorkeeper for OAuth2
+gem "doorkeeper"
+gem "doorkeeper-i18n"
+

 # Markdown formatting support
 gem "kramdown"
 
 # Markdown formatting support
 gem "kramdown"
 


@@ -92,6 +103,7 @@ gem "maxminddb"
 gem "rotp"
 
 # Load memcache client in case we are using it
 gem "rotp"
 
 # Load memcache client in case we are using it

+gem "connection_pool"

 gem "dalli"
 gem "kgio"
 
 gem "dalli"
 gem "kgio"
 


@@ -117,7 +129,10 @@ gem "browser"
 gem "aws-sdk-s3"
 
 # Used to resize user images
 gem "aws-sdk-s3"
 
 # Used to resize user images

-gem "mini_magick"
+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
 
 # Gems useful for development
 group :development do


@@ -136,12 +151,13 @@ 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.0"
+  gem "puma", "~> 5.6"

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

+  gem "rubocop-rake"

   gem "selenium-webdriver"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "selenium-webdriver"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false