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

diff --combined Gemfile
index c16d36497ee2ebb6740b50f3ff5082ddec4a0c95,8b606ddd508ef76cd909ea823af09d08a5cf5701..35058f33423c47086922da9f65ad99dd36ae775c
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -49,12 -49,12 +49,12 @@@ gem "composite_primary_keys", "~> 12.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,7 -143,7 +143,7 @@@ group :test d
    gem "erb_lint", :require => false
    gem "factory_bot_rails"
    gem "minitest", "~> 5.1"
-   gem "puma", "~> 3.11"
+   gem "puma", "~> 4.3"
    gem "rails-controller-testing"
    gem "rubocop"
    gem "rubocop-minitest"

diff --combined Gemfile.lock
index ba82878050e3b7b6ce931d904b7ad004fefb46ed,979b4c90c0964b073de44a8b13e38ed11992a5ca..d0155bcd0eb85c31a97938c40ea52463545e6879
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -219,8 -219,8 +219,8 @@@ GE
      hashie (4.1.0)
      html_tokenizer (0.0.7)
      htmlentities (4.3.4)
 -    http_accept_language (2.0.5)
 -    i18n (0.9.5)
 +    http_accept_language (2.1.1)
 +    i18n (1.8.3)
        concurrent-ruby (~> 1.0)
      i18n-js (3.7.0)
        i18n (>= 0.6.6)
@@@ -328,7 -328,8 +328,8 @@@
      progress (3.5.2)
      psych (3.1.0)
      public_suffix (4.0.5)
-     puma (3.12.6)
+     puma (4.3.5)
+       nio4r (~> 2.0)
      quad_tile (1.0.1)
      r2 (0.2.7)
      rack (2.2.3)
@@@ -364,9 -365,9 +365,9 @@@
        nokogiri (>= 1.6)
      rails-html-sanitizer (1.3.0)
        loofah (~> 2.3)
 -    rails-i18n (4.0.2)
 -      i18n (~> 0.6)
 -      rails (>= 4.0)
 +    rails-i18n (6.0.0)
 +      i18n (>= 0.7, < 2)
 +      railties (>= 6.0.0, < 7)
      railties (6.0.3.2)
        actionpack (= 6.0.3.2)
        activesupport (= 6.0.3.2)
@@@ -500,7 -501,7 +501,7 @@@ DEPENDENCIE
    ffi-libarchive
    gd2-ffij (>= 0.4.0)
    htmlentities
 -  http_accept_language (~> 2.0.0)
 +  http_accept_language (~> 2.1.1)
    i18n-js (>= 3.0.0)
    image_optim_rails
    jbuilder (~> 2.7)
@@@ -526,14 -527,14 +527,14 @@@
    openstreetmap-deadlock_retry (>= 1.3.0)
    pg
    psych
-   puma (~> 3.11)
+   puma (~> 4.3)
    quad_tile (~> 1.0.1)
    r2 (~> 0.2.7)
    rack-cors
    rack-uri_sanitizer
    rails (= 6.0.3.2)
    rails-controller-testing
 -  rails-i18n (~> 4.0.0)
 +  rails-i18n (~> 6.0.0)
    rinku (>= 2.0.6)
    rotp
    rubocop