X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bb7f5ac2c8cf74669b421e7ae346a0cdd1ba5186..fb9219a52fdc3160358c4ffa8bbe26cd817b007c:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index e17772d34..f5d0f7f4f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.1.4.1" +gem "rails", "~> 7.0.0" # Require json for multi_json gem "json" @@ -36,23 +36,26 @@ 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", "~> 13.0.0", "!= 13.0.1" +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" -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" @@ -128,6 +131,9 @@ gem "aws-sdk-s3" # 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" @@ -145,14 +151,14 @@ group :test do 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 "rubocop-performance" gem "rubocop-rails" gem "rubocop-rake" - gem "selenium-webdriver", "~> 3.142.7" + gem "selenium-webdriver" gem "simplecov", :require => false gem "simplecov-lcov", :require => false gem "webmock"