X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/64b3e289ac14533c6fb2b1223b6417ad0446878c..d49771ba95766b62534c607d2ab28a1a41aae14b:/Gemfile diff --git a/Gemfile b/Gemfile index f79e13a8f..35058f334 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.2.2" +gem "rails", "6.0.3.2" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -49,12 +49,12 @@ gem "composite_primary_keys", "~> 12.0.0" gem "config" gem "delayed_job_active_record" gem "dynamic_form" -gem "http_accept_language", "~> 2.0.0" +gem "http_accept_language", "~> 2.1.1" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" gem "rack-cors" -gem "rails-i18n", "~> 4.0.0" +gem "rails-i18n", "~> 6.0.0" gem "rinku", ">= 2.0.6", :require => "rails_rinku" gem "strong_migrations" gem "validates_email_format_of", ">= 1.5.1" @@ -143,8 +143,7 @@ group :test do gem "erb_lint", :require => false gem "factory_bot_rails" gem "minitest", "~> 5.1" - gem "poltergeist" - gem "puma", "~> 3.11" + gem "puma", "~> 4.3" gem "rails-controller-testing" gem "rubocop" gem "rubocop-minitest"