X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7b1e78e2473adc365f2ef8c72b47115710db8556..c23f03d09b51be12a832b391e84bf3b2b072861c:/Gemfile diff --git a/Gemfile b/Gemfile index c4d611430..b0c930549 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.3" # Require json for multi_json gem "json" @@ -24,9 +24,6 @@ gem "jbuilder", "~> 2.7" # Reduces boot times through caching; required in config/boot.rb gem "bootsnap", ">= 1.4.2", :require => false -# Block upgrades to sprockets-rails 3.4.0 -gem "sprockets-rails", "< 3.4.0" - # Use R2 for RTL conversion gem "r2", "~> 0.2.7" @@ -46,7 +43,7 @@ gem "active_record_union" gem "bootstrap", "~> 4.5.0" gem "bootstrap_form", "~> 4.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 "http_accept_language", "~> 2.1.1" @@ -54,7 +51,7 @@ gem "i18n-js", ">= 3.0.0" 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" @@ -147,14 +144,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"